From 4c682403544d557b47a1d5501c44e9ddd24c4715 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Sun, 25 Oct 2020 17:16:57 +0800 Subject: [PATCH 1/3] [patch tracking] 20201025171641209800 - https://github.com/https://github.com/BJMX/testPatch01/commit/1bfd7e5971ed313a73ae82e904a05ecffbf75fc7 --- 1bfd7e5971ed313a73ae82e904a05ecffbf75fc7.patch | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 1bfd7e5971ed313a73ae82e904a05ecffbf75fc7.patch diff --git a/1bfd7e5971ed313a73ae82e904a05ecffbf75fc7.patch b/1bfd7e5971ed313a73ae82e904a05ecffbf75fc7.patch new file mode 100644 index 00000000..b3276053 --- /dev/null +++ b/1bfd7e5971ed313a73ae82e904a05ecffbf75fc7.patch @@ -0,0 +1,9 @@ +diff --git a/2.txt b/2.txt +index 48f4cb6..f66fae5 100644 +--- a/2.txt ++++ b/2.txt +@@ -1,4 +1,3 @@ + 000 + 111 + 222 +-333 \ No newline at end of file -- Gitee From 0b87e890b87cb4545cde5567a30c2e17d935eac5 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Sun, 25 Oct 2020 17:16:58 +0800 Subject: [PATCH 2/3] [patch tracking] 20201025171641209800 - https://github.com/https://github.com/BJMX/testPatch01/commit/40f2e236291235a0f2101b914ffde2cc6101e32e --- 40f2e236291235a0f2101b914ffde2cc6101e32e.patch | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 40f2e236291235a0f2101b914ffde2cc6101e32e.patch diff --git a/40f2e236291235a0f2101b914ffde2cc6101e32e.patch b/40f2e236291235a0f2101b914ffde2cc6101e32e.patch new file mode 100644 index 00000000..90dbd2f6 --- /dev/null +++ b/40f2e236291235a0f2101b914ffde2cc6101e32e.patch @@ -0,0 +1,9 @@ +diff --git a/2.txt b/2.txt +index e8b11e4..48f4cb6 100644 +--- a/2.txt ++++ b/2.txt +@@ -2,4 +2,3 @@ + 111 + 222 + 333 +-444 \ No newline at end of file -- Gitee From 0841a18313ada8f198ce1478ad9b914cd6b10fb9 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Sun, 25 Oct 2020 17:16:59 +0800 Subject: [PATCH 3/3] [patch tracking] 20201025171641209800 - create spec file --- testPatch2.spec | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 testPatch2.spec diff --git a/testPatch2.spec b/testPatch2.spec new file mode 100644 index 00000000..e69f60c7 --- /dev/null +++ b/testPatch2.spec @@ -0,0 +1,5 @@ + +Patch6000: 1bfd7e5971ed313a73ae82e904a05ecffbf75fc7.patch +Patch6001: 40f2e236291235a0f2101b914ffde2cc6101e32e.patch +* 20201025171641209800 patch-tracking 0.0-1 +- append patch file of upstream repository from <1bfd7e5971ed313a73ae82e904a05ecffbf75fc7> to <40f2e236291235a0f2101b914ffde2cc6101e32e> -- Gitee