Can I patch the patch?
up vote
0
down vote
favorite
In our CI we are patching files, the problem appears when we make changes in files which we patch, can I applay commit changes to patch file?
example:
text.txt
A
B
C
D
patch.patch
+++ b/text2.txt
@@ -1,4 +1,4 @@
A
B
-C
+X
D
new.txt:
Y
Y
B
C
D
diff text.txt new.txt > text_to_new.diff
diff --git a/text.txt b/new.txt
index 8422d40..4780582 100644
--- a/text.txt
+++ b/new.txt
@@ -1,4 +1,5 @@
-A
+Y
+Y
B
C
D
Can I update patch.patch with text_to_new.diff?
diff patch
add a comment |
up vote
0
down vote
favorite
In our CI we are patching files, the problem appears when we make changes in files which we patch, can I applay commit changes to patch file?
example:
text.txt
A
B
C
D
patch.patch
+++ b/text2.txt
@@ -1,4 +1,4 @@
A
B
-C
+X
D
new.txt:
Y
Y
B
C
D
diff text.txt new.txt > text_to_new.diff
diff --git a/text.txt b/new.txt
index 8422d40..4780582 100644
--- a/text.txt
+++ b/new.txt
@@ -1,4 +1,5 @@
-A
+Y
+Y
B
C
D
Can I update patch.patch with text_to_new.diff?
diff patch
Why not apply the patches in order?
– Rafael
2 days ago
I am using it in CI: I have the newest repo version and need to make same changes in code in order to test it (change same IPs and patch do files), so I can not run it in order.
– Bartłomiej Bartnicki
2 days ago
add a comment |
up vote
0
down vote
favorite
up vote
0
down vote
favorite
In our CI we are patching files, the problem appears when we make changes in files which we patch, can I applay commit changes to patch file?
example:
text.txt
A
B
C
D
patch.patch
+++ b/text2.txt
@@ -1,4 +1,4 @@
A
B
-C
+X
D
new.txt:
Y
Y
B
C
D
diff text.txt new.txt > text_to_new.diff
diff --git a/text.txt b/new.txt
index 8422d40..4780582 100644
--- a/text.txt
+++ b/new.txt
@@ -1,4 +1,5 @@
-A
+Y
+Y
B
C
D
Can I update patch.patch with text_to_new.diff?
diff patch
In our CI we are patching files, the problem appears when we make changes in files which we patch, can I applay commit changes to patch file?
example:
text.txt
A
B
C
D
patch.patch
+++ b/text2.txt
@@ -1,4 +1,4 @@
A
B
-C
+X
D
new.txt:
Y
Y
B
C
D
diff text.txt new.txt > text_to_new.diff
diff --git a/text.txt b/new.txt
index 8422d40..4780582 100644
--- a/text.txt
+++ b/new.txt
@@ -1,4 +1,5 @@
-A
+Y
+Y
B
C
D
Can I update patch.patch with text_to_new.diff?
diff patch
diff patch
asked 2 days ago
Bartłomiej Bartnicki
433417
433417
Why not apply the patches in order?
– Rafael
2 days ago
I am using it in CI: I have the newest repo version and need to make same changes in code in order to test it (change same IPs and patch do files), so I can not run it in order.
– Bartłomiej Bartnicki
2 days ago
add a comment |
Why not apply the patches in order?
– Rafael
2 days ago
I am using it in CI: I have the newest repo version and need to make same changes in code in order to test it (change same IPs and patch do files), so I can not run it in order.
– Bartłomiej Bartnicki
2 days ago
Why not apply the patches in order?
– Rafael
2 days ago
Why not apply the patches in order?
– Rafael
2 days ago
I am using it in CI: I have the newest repo version and need to make same changes in code in order to test it (change same IPs and patch do files), so I can not run it in order.
– Bartłomiej Bartnicki
2 days ago
I am using it in CI: I have the newest repo version and need to make same changes in code in order to test it (change same IPs and patch do files), so I can not run it in order.
– Bartłomiej Bartnicki
2 days ago
add a comment |
active
oldest
votes
active
oldest
votes
active
oldest
votes
active
oldest
votes
active
oldest
votes
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53372787%2fcan-i-patch-the-patch%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Why not apply the patches in order?
– Rafael
2 days ago
I am using it in CI: I have the newest repo version and need to make same changes in code in order to test it (change same IPs and patch do files), so I can not run it in order.
– Bartłomiej Bartnicki
2 days ago