From edad954c592bd71e1506411f758b7e995e3eae37 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Fri, 23 Oct 2020 17:53:14 +0800 Subject: [PATCH 1/3] [patch tracking] 20201023175305962794 - https://github.com/BJMX/testPatch01/commit/1c4f1c37cfbee9eac622f4a50006049c9da46e4d --- 1c4f1c37cfbee9eac622f4a50006049c9da46e4d.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 1c4f1c37cfbee9eac622f4a50006049c9da46e4d.patch diff --git a/1c4f1c37cfbee9eac622f4a50006049c9da46e4d.patch b/1c4f1c37cfbee9eac622f4a50006049c9da46e4d.patch new file mode 100644 index 00000000..9a90d0b3 --- /dev/null +++ b/1c4f1c37cfbee9eac622f4a50006049c9da46e4d.patch @@ -0,0 +1,10 @@ +diff --git a/2.txt b/2.txt +index 48f4cb6..19b8996 100644 +--- a/2.txt ++++ b/2.txt +@@ -1,4 +1,4 @@ + 000 + 111 + 222 +-333 ++ -- Gitee From 3937380e8c9aacd08c2099cc73ddb4493cf64f80 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Fri, 23 Oct 2020 17:53:14 +0800 Subject: [PATCH 2/3] [patch tracking] 20201023175305962794 - https://github.com/BJMX/testPatch01/commit/326e24bdae234179c8fe3201a7bff576f6029b14 --- 326e24bdae234179c8fe3201a7bff576f6029b14.patch | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 326e24bdae234179c8fe3201a7bff576f6029b14.patch diff --git a/326e24bdae234179c8fe3201a7bff576f6029b14.patch b/326e24bdae234179c8fe3201a7bff576f6029b14.patch new file mode 100644 index 00000000..b4d11247 --- /dev/null +++ b/326e24bdae234179c8fe3201a7bff576f6029b14.patch @@ -0,0 +1,9 @@ +diff --git a/2.txt b/2.txt +index 19b8996..3ed45fa 100644 +--- a/2.txt ++++ b/2.txt +@@ -1,4 +1,3 @@ + 000 + 111 +-222 + -- Gitee From 0abdcd4f47a3ecfd68271760a7a119f1b54ac5c6 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Fri, 23 Oct 2020 17:53:15 +0800 Subject: [PATCH 3/3] [patch tracking] 20201023175305962794 - update spec file --- testPatch1.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testPatch1.spec b/testPatch1.spec index d94df11d..a6d7bb29 100644 --- a/testPatch1.spec +++ b/testPatch1.spec @@ -1,4 +1,9 @@ -000000000000000 +1 +Patch6000: 1c4f1c37cfbee9eac622f4a50006049c9da46e4d.patch +Patch6001: 326e24bdae234179c8fe3201a7bff576f6029b14.patch +* 20201023175305962794 patch-tracking 0.0-1 +- append patch file of upstream repository from <1c4f1c37cfbee9eac622f4a50006049c9da46e4d> to <326e24bdae234179c8fe3201a7bff576f6029b14> + 1111111111111111 222222222222222222 -- Gitee