From 63ca104f7eb890f92fb567a584a8aadce7fd0e63 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Mon, 21 Dec 2020 14:55:31 +0800 Subject: [PATCH 1/5] [patch tracking] 20201221145519905925 - https://github.com/BJMX/testPatch01/commit/3660d745e65f6d09d3f961b9ef901d2948b70a8d --- 3660d745e65f6d09d3f961b9ef901d2948b70a8d.patch | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 3660d745e65f6d09d3f961b9ef901d2948b70a8d.patch diff --git a/3660d745e65f6d09d3f961b9ef901d2948b70a8d.patch b/3660d745e65f6d09d3f961b9ef901d2948b70a8d.patch new file mode 100644 index 00000000..7b40b4a6 --- /dev/null +++ b/3660d745e65f6d09d3f961b9ef901d2948b70a8d.patch @@ -0,0 +1,9 @@ +diff --git a/1.txt b/1.txt +index 06e567b..535d2b0 100644 +--- a/1.txt ++++ b/1.txt +@@ -5,3 +5,4 @@ + 5 + 6 + 7 ++8 -- Gitee From d84a76078592b17f0f00a80a25a5614c98c6184d Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Mon, 21 Dec 2020 14:55:32 +0800 Subject: [PATCH 2/5] [patch tracking] 20201221145519905925 - https://github.com/BJMX/testPatch01/commit/25a6cae792cef5b260d9e696f35384201653dbbf --- 25a6cae792cef5b260d9e696f35384201653dbbf.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 25a6cae792cef5b260d9e696f35384201653dbbf.patch diff --git a/25a6cae792cef5b260d9e696f35384201653dbbf.patch b/25a6cae792cef5b260d9e696f35384201653dbbf.patch new file mode 100644 index 00000000..9217852b --- /dev/null +++ b/25a6cae792cef5b260d9e696f35384201653dbbf.patch @@ -0,0 +1,14 @@ +diff --git a/1.txt b/1.txt +index 535d2b0..573541a 100644 +--- a/1.txt ++++ b/1.txt +@@ -1,8 +1 @@ +-1 +-2 +-3 +-4 +-5 +-6 +-7 +-8 ++0 -- Gitee From 9ddb01af7024765b80779bf24882df1d218af666 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Mon, 21 Dec 2020 14:55:33 +0800 Subject: [PATCH 3/5] [patch tracking] 20201221145519905925 - https://github.com/BJMX/testPatch01/commit/f543eb0e1b5cf8cc8930878ac214cb1f1e0b7385 --- f543eb0e1b5cf8cc8930878ac214cb1f1e0b7385.patch | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 f543eb0e1b5cf8cc8930878ac214cb1f1e0b7385.patch diff --git a/f543eb0e1b5cf8cc8930878ac214cb1f1e0b7385.patch b/f543eb0e1b5cf8cc8930878ac214cb1f1e0b7385.patch new file mode 100644 index 00000000..f915f0fc --- /dev/null +++ b/f543eb0e1b5cf8cc8930878ac214cb1f1e0b7385.patch @@ -0,0 +1,7 @@ +diff --git a/1.txt b/1.txt +index 573541a..0d66ea1 100644 +--- a/1.txt ++++ b/1.txt +@@ -1 +1,2 @@ + 0 ++1 -- Gitee From 99406ac8d848b53bb2fd2b53b18daa6293ac3ca4 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Mon, 21 Dec 2020 14:55:34 +0800 Subject: [PATCH 4/5] [patch tracking] 20201221145519905925 - https://github.com/BJMX/testPatch01/commit/6d6c5b43c25786cc11ad89f27199418779894690 --- 6d6c5b43c25786cc11ad89f27199418779894690.patch | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 6d6c5b43c25786cc11ad89f27199418779894690.patch diff --git a/6d6c5b43c25786cc11ad89f27199418779894690.patch b/6d6c5b43c25786cc11ad89f27199418779894690.patch new file mode 100644 index 00000000..1da822df --- /dev/null +++ b/6d6c5b43c25786cc11ad89f27199418779894690.patch @@ -0,0 +1,8 @@ +diff --git a/1.txt b/1.txt +index 0d66ea1..4539bbf 100644 +--- a/1.txt ++++ b/1.txt +@@ -1,2 +1,3 @@ + 0 + 1 ++2 -- Gitee From 3f0acdc517711e7d374d1126d6f4542015429d70 Mon Sep 17 00:00:00 2001 From: ZhangYifan Date: Mon, 21 Dec 2020 14:55:34 +0800 Subject: [PATCH 5/5] [patch tracking] 20201221145519905925 - update spec file --- testPatch1.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/testPatch1.spec b/testPatch1.spec index d94df11d..ebe2e2c3 100644 --- a/testPatch1.spec +++ b/testPatch1.spec @@ -1,4 +1,11 @@ -000000000000000 +1 +Patch6000: 3660d745e65f6d09d3f961b9ef901d2948b70a8d.patch +Patch6001: 25a6cae792cef5b260d9e696f35384201653dbbf.patch +Patch6002: f543eb0e1b5cf8cc8930878ac214cb1f1e0b7385.patch +Patch6003: 6d6c5b43c25786cc11ad89f27199418779894690.patch +* Mon Dec 21 2020 patch-tracking 0.0-1 +- append patch file of upstream repository from <3660d745e65f6d09d3f961b9ef901d2948b70a8d> to <6d6c5b43c25786cc11ad89f27199418779894690> + 1111111111111111 222222222222222222 -- Gitee