From 9a1e351f49e4905c1681eb099c5b032651f1ab13 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Mon, 26 Oct 2020 11:01:05 +0800 Subject: [PATCH 1/3] [patch tracking] 20201026110042325979 - https://github.com/BJMX/testPatch01/commit/66d85846cd71b370a73808b640071fcb9486ff63 --- 66d85846cd71b370a73808b640071fcb9486ff63.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 66d85846cd71b370a73808b640071fcb9486ff63.patch diff --git a/66d85846cd71b370a73808b640071fcb9486ff63.patch b/66d85846cd71b370a73808b640071fcb9486ff63.patch new file mode 100644 index 00000000..6eacbaee --- /dev/null +++ b/66d85846cd71b370a73808b640071fcb9486ff63.patch @@ -0,0 +1,13 @@ +diff --git a/2.txt b/2.txt +index 9fe1ffe..abef87b 100644 +--- a/2.txt ++++ b/2.txt +@@ -1,7 +1,3 @@ + 000 + 111 +-222 +-333 +-444 +-555 +-666 ++2 -- Gitee From ffc087302ea4bbf9061bb00e1b30c91696bd0e48 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Mon, 26 Oct 2020 11:01:05 +0800 Subject: [PATCH 2/3] [patch tracking] 20201026110042325979 - https://github.com/BJMX/testPatch01/commit/d98f3e247b3e1f4ba8db21d0d0d3af753627d7db --- d98f3e247b3e1f4ba8db21d0d0d3af753627d7db.patch | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 d98f3e247b3e1f4ba8db21d0d0d3af753627d7db.patch diff --git a/d98f3e247b3e1f4ba8db21d0d0d3af753627d7db.patch b/d98f3e247b3e1f4ba8db21d0d0d3af753627d7db.patch new file mode 100644 index 00000000..8649211d --- /dev/null +++ b/d98f3e247b3e1f4ba8db21d0d0d3af753627d7db.patch @@ -0,0 +1,9 @@ +diff --git a/2.txt b/2.txt +index abef87b..5eeda3b 100644 +--- a/2.txt ++++ b/2.txt +@@ -1,3 +1,2 @@ + 000 +-111 +-2 ++1 -- Gitee From c93da064ebda929bb8e3b9ea5fe4266326921908 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Mon, 26 Oct 2020 11:01:06 +0800 Subject: [PATCH 3/3] [patch tracking] 20201026110042325979 - update spec file --- testPatch1.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testPatch1.spec b/testPatch1.spec index d94df11d..114d3ef3 100644 --- a/testPatch1.spec +++ b/testPatch1.spec @@ -1,4 +1,9 @@ -000000000000000 +1 +Patch6000: 66d85846cd71b370a73808b640071fcb9486ff63.patch +Patch6001: d98f3e247b3e1f4ba8db21d0d0d3af753627d7db.patch +* 20201026110042325979 patch-tracking 0.0-1 +- append patch file of upstream repository from <66d85846cd71b370a73808b640071fcb9486ff63> to + 1111111111111111 222222222222222222 -- Gitee