From ac383bdbfba1ae4ea28294713efd392dd1571fce Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Sun, 25 Oct 2020 17:16:53 +0800 Subject: [PATCH 1/3] [patch tracking] 20201025171641188781 - 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..ff444bf2 --- /dev/null +++ b/1bfd7e5971ed313a73ae82e904a05ecffbf75fc7.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 afcf3bcb52b5d355e0cf2d7f224a74bcf4bf6732 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Sun, 25 Oct 2020 17:16:54 +0800 Subject: [PATCH 2/3] [patch tracking] 20201025171641188781 - 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..355cc9f6 --- /dev/null +++ b/40f2e236291235a0f2101b914ffde2cc6101e32e.patch @@ -0,0 +1,9 @@ +diff --git a/2.txt b/2.txt +index 48f4cb6..e8b11e4 100644 +--- a/2.txt ++++ b/2.txt +@@ -2,3 +2,4 @@ + 111 + 222 + 333 ++444 -- Gitee From 9daf88ed812ae465ffc5d54b46d7d053e2e45d5f Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Sun, 25 Oct 2020 17:16:55 +0800 Subject: [PATCH 3/3] [patch tracking] 20201025171641188781 - update spec file --- testPatch1.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testPatch1.spec b/testPatch1.spec index d94df11d..334692d3 100644 --- a/testPatch1.spec +++ b/testPatch1.spec @@ -1,4 +1,9 @@ -000000000000000 +1 +Patch6000: 1bfd7e5971ed313a73ae82e904a05ecffbf75fc7.patch +Patch6001: 40f2e236291235a0f2101b914ffde2cc6101e32e.patch +* 20201025171641188781 patch-tracking 0.0-1 +- append patch file of upstream repository from <1bfd7e5971ed313a73ae82e904a05ecffbf75fc7> to <40f2e236291235a0f2101b914ffde2cc6101e32e> + 1111111111111111 222222222222222222 -- Gitee