From d4cc29ae29d7ab164e2a7b6f26126fb9b853082c Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Sun, 25 Oct 2020 19:36:08 +0800 Subject: [PATCH 1/3] [patch tracking] 20201025193602930411 - https://github.com/BJMX/testPatch01/commit/0d42aa769095ec044f05bc82acf2e31e91c89558 --- 0d42aa769095ec044f05bc82acf2e31e91c89558.patch | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 0d42aa769095ec044f05bc82acf2e31e91c89558.patch diff --git a/0d42aa769095ec044f05bc82acf2e31e91c89558.patch b/0d42aa769095ec044f05bc82acf2e31e91c89558.patch new file mode 100644 index 00000000..ccb78b46 --- /dev/null +++ b/0d42aa769095ec044f05bc82acf2e31e91c89558.patch @@ -0,0 +1,9 @@ +diff --git a/2.txt b/2.txt +index e8b11e4..739a958 100644 +--- a/2.txt ++++ b/2.txt +@@ -3,3 +3,4 @@ + 222 + 333 + 444 ++555 -- Gitee From f575043e291928dbc5030f1b37d9c95f680e659b Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Sun, 25 Oct 2020 19:36:09 +0800 Subject: [PATCH 2/3] [patch tracking] 20201025193602930411 - https://github.com/BJMX/testPatch01/commit/1f917645646c90bfa391e48f34391d97851c2f66 --- 1f917645646c90bfa391e48f34391d97851c2f66.patch | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 1f917645646c90bfa391e48f34391d97851c2f66.patch diff --git a/1f917645646c90bfa391e48f34391d97851c2f66.patch b/1f917645646c90bfa391e48f34391d97851c2f66.patch new file mode 100644 index 00000000..c8e9c287 --- /dev/null +++ b/1f917645646c90bfa391e48f34391d97851c2f66.patch @@ -0,0 +1,9 @@ +diff --git a/2.txt b/2.txt +index 739a958..9fe1ffe 100644 +--- a/2.txt ++++ b/2.txt +@@ -4,3 +4,4 @@ + 333 + 444 + 555 ++666 -- Gitee From 28a50246eeee7745f46776564b4ad9743b9bea22 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Sun, 25 Oct 2020 19:36:10 +0800 Subject: [PATCH 3/3] [patch tracking] 20201025193602930411 - update spec file --- testPatch1.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testPatch1.spec b/testPatch1.spec index d94df11d..5995715c 100644 --- a/testPatch1.spec +++ b/testPatch1.spec @@ -1,4 +1,9 @@ -000000000000000 +1 +Patch6000: 0d42aa769095ec044f05bc82acf2e31e91c89558.patch +Patch6001: 1f917645646c90bfa391e48f34391d97851c2f66.patch +* 20201025193602930411 patch-tracking 0.0-1 +- append patch file of upstream repository from <0d42aa769095ec044f05bc82acf2e31e91c89558> to <1f917645646c90bfa391e48f34391d97851c2f66> + 1111111111111111 222222222222222222 -- Gitee