Can I patch the patch?
0
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
asked Nov 19 '18 at 10:37
Bartłomiej BartnickiBartłomiej Bartnicki
463417
add a comment |
0
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
asked Nov 19 '18 at 10:37
Bartłomiej BartnickiBartłomiej Bartnicki
463417
Why not apply the patches in order?
– Rafael
Nov 19 '18 at 10:39
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
Nov 19 '18 at 10:41
add a comment |
0
0
0
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
asked Nov 19 '18 at 10:37
Bartłomiej BartnickiBartłomiej Bartnicki
463417
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 Nov 19 '18 at 10:37
Bartłomiej BartnickiBartłomiej Bartnicki
463417
asked Nov 19 '18 at 10:37
Bartłomiej BartnickiBartłomiej Bartnicki
463417
asked Nov 19 '18 at 10:37
Bartłomiej BartnickiBartłomiej Bartnicki
463417
asked Nov 19 '18 at 10:37
Bartłomiej BartnickiBartłomiej Bartnicki
463417
asked Nov 19 '18 at 10:37
Bartłomiej BartnickiBartłomiej Bartnicki
463417
463417
Why not apply the patches in order?
– Rafael
Nov 19 '18 at 10:39
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
Nov 19 '18 at 10:41
add a comment |
Why not apply the patches in order?
– Rafael
Nov 19 '18 at 10:39
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
Nov 19 '18 at 10:41
Why not apply the patches in order?
– Rafael
Nov 19 '18 at 10:39
Why not apply the patches in order?
– Rafael
Nov 19 '18 at 10:39
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
Nov 19 '18 at 10:41
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
Nov 19 '18 at 10:41
add a comment |
0
active
oldest
votes
Your Answer
StackExchange.ifUsing("editor", function () {
StackExchange.using("externalEditor", function () {
StackExchange.using("snippets", function () {
StackExchange.snippets.init();
});
});
}, "code-snippets");
StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "1"
};
initTagRenderer("".split(" "), "".split(" "), channelOptions);
StackExchange.using("externalEditor", function() {
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled) {
StackExchange.using("snippets", function() {
createEditor();
});
}
else {
createEditor();
}
});
function createEditor() {
StackExchange.prepareEditor({
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader: {
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
},
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
});
}
});
draft saved
draft discarded
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
0
active
oldest
votes
0
active
oldest
votes
active
oldest
votes
active
oldest
votes
draft saved
draft discarded
Thanks for contributing an answer to Stack Overflow!
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
draft saved
draft discarded
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
Nov 19 '18 at 10:39
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
Nov 19 '18 at 10:41