From 3a5a1972a6a73c217c644104c1134d72fc36cfb9 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Fri, 23 Oct 2020 17:43:26 +0800 Subject: [PATCH 1/3] [patch tracking] 20201023174301670251 - https://github.com/BJMX/testPatch01/commit/9fe85ae56e6d165d5c231c70a7b0a13893d107fc --- 9fe85ae56e6d165d5c231c70a7b0a13893d107fc.patch | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 9fe85ae56e6d165d5c231c70a7b0a13893d107fc.patch diff --git a/9fe85ae56e6d165d5c231c70a7b0a13893d107fc.patch b/9fe85ae56e6d165d5c231c70a7b0a13893d107fc.patch new file mode 100644 index 00000000..58236df6 --- /dev/null +++ b/9fe85ae56e6d165d5c231c70a7b0a13893d107fc.patch @@ -0,0 +1,8 @@ +diff --git a/2.txt b/2.txt +index 8156dd5..f66fae5 100644 +--- a/2.txt ++++ b/2.txt +@@ -1,2 +1,3 @@ + 000 + 111 ++222 -- Gitee From e121a8a10ea47f3c153ca8e384e7eebbc5f915da Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Fri, 23 Oct 2020 17:43:27 +0800 Subject: [PATCH 2/3] [patch tracking] 20201023174301670251 - https://github.com/BJMX/testPatch01/commit/7698c3ab7a661b300991937dfc85f4998e78ef54 --- 7698c3ab7a661b300991937dfc85f4998e78ef54.patch | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 7698c3ab7a661b300991937dfc85f4998e78ef54.patch diff --git a/7698c3ab7a661b300991937dfc85f4998e78ef54.patch b/7698c3ab7a661b300991937dfc85f4998e78ef54.patch new file mode 100644 index 00000000..ff444bf2 --- /dev/null +++ b/7698c3ab7a661b300991937dfc85f4998e78ef54.patch @@ -0,0 +1,9 @@ +diff --git a/2.txt b/2.txt +index f66fae5..48f4cb6 100644 +--- a/2.txt ++++ b/2.txt +@@ -1,3 +1,4 @@ + 000 + 111 + 222 ++333 -- Gitee From 4a245b58dcf97d99f0a82b58b1812ec5d91460c9 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Fri, 23 Oct 2020 17:43:28 +0800 Subject: [PATCH 3/3] [patch tracking] 20201023174301670251 - update spec file --- testPatch1.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testPatch1.spec b/testPatch1.spec index d94df11d..eb5c7edd 100644 --- a/testPatch1.spec +++ b/testPatch1.spec @@ -1,4 +1,9 @@ -000000000000000 +1 +Patch6000: 9fe85ae56e6d165d5c231c70a7b0a13893d107fc.patch +Patch6001: 7698c3ab7a661b300991937dfc85f4998e78ef54.patch +* 20201023174301670251 patch-tracking 0.0-1 +- append patch file of upstream repository from <9fe85ae56e6d165d5c231c70a7b0a13893d107fc> to <7698c3ab7a661b300991937dfc85f4998e78ef54> + 1111111111111111 222222222222222222 -- Gitee