From ffc3311e5f609ea115a72ce2f60b9e099e2bdf21 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Fri, 23 Oct 2020 17:53:13 +0800 Subject: [PATCH 1/3] [patch tracking] 20201023175305966763 - https://github.com/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..9aedbdda --- /dev/null +++ b/1c4f1c37cfbee9eac622f4a50006049c9da46e4d.patch @@ -0,0 +1,10 @@ +diff --git a/2.txt b/2.txt +index 19b8996..48f4cb6 100644 +--- a/2.txt ++++ b/2.txt +@@ -1,4 +1,4 @@ + 000 + 111 + 222 +- ++333 \ No newline at end of file -- Gitee From 3f064a4bed32404652c33c2597c1d9958eb57b18 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Fri, 23 Oct 2020 17:53:14 +0800 Subject: [PATCH 2/3] [patch tracking] 20201023175305966763 - https://github.com/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..a7ae1631 --- /dev/null +++ b/326e24bdae234179c8fe3201a7bff576f6029b14.patch @@ -0,0 +1,9 @@ +diff --git a/2.txt b/2.txt +index 3ed45fa..19b8996 100644 +--- a/2.txt ++++ b/2.txt +@@ -1,3 +1,4 @@ + 000 + 111 ++222 + \ No newline at end of file -- Gitee From 716c302e6c862991f25e2cd75406db90e34e869c Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Fri, 23 Oct 2020 17:53:14 +0800 Subject: [PATCH 3/3] [patch tracking] 20201023175305966763 - 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..84ac31b4 --- /dev/null +++ b/testPatch2.spec @@ -0,0 +1,5 @@ + +Patch6000: 1c4f1c37cfbee9eac622f4a50006049c9da46e4d.patch +Patch6001: 326e24bdae234179c8fe3201a7bff576f6029b14.patch +* 20201023175305966763 patch-tracking 0.0-1 +- append patch file of upstream repository from <1c4f1c37cfbee9eac622f4a50006049c9da46e4d> to <326e24bdae234179c8fe3201a7bff576f6029b14> -- Gitee