SVN merge with multiple revisions [Not Range]
I am trying to merge some specific revisions of a source branch to destination branch. Using Python script.
When I use svn merge --dry-run
range of revisions works fine. -r 72338:HEAD
Single revision works fine -c 72338.
If I use multiple revisions -c 71750 -c 72338, SVN merge is taking only first revision.
I need to merge multiple revisions such as 71750, 72338, 72394.
Is it possible?
My code
import subprocess
p = subprocess.Popen("svn merge --dry-run -c71750 -c72238 https://URL/", stdout=subprocess.PIPE, shell=True)
output, err = p.communicate()
Output
Output is --- Merging r71750 into '.':
C /path/to/file.java
Summary of conflicts:
Text conflicts: 1
python svn svn-merge
asked Nov 14 '18 at 7:33
BromountBromount
12
add a comment |
I am trying to merge some specific revisions of a source branch to destination branch. Using Python script.
When I use svn merge --dry-run
range of revisions works fine. -r 72338:HEAD
Single revision works fine -c 72338.
If I use multiple revisions -c 71750 -c 72338, SVN merge is taking only first revision.
I need to merge multiple revisions such as 71750, 72338, 72394.
Is it possible?
My code
import subprocess
p = subprocess.Popen("svn merge --dry-run -c71750 -c72238 https://URL/", stdout=subprocess.PIPE, shell=True)
output, err = p.communicate()
Output
Output is --- Merging r71750 into '.':
C /path/to/file.java
Summary of conflicts:
Text conflicts: 1
python svn svn-merge
asked Nov 14 '18 at 7:33
BromountBromount
12
-c 71750 72238is working only if the 71750 doesn't have any conflicts.
– Bromount
Nov 14 '18 at 16:44
add a comment |
I am trying to merge some specific revisions of a source branch to destination branch. Using Python script.
When I use svn merge --dry-run
range of revisions works fine. -r 72338:HEAD
Single revision works fine -c 72338.
If I use multiple revisions -c 71750 -c 72338, SVN merge is taking only first revision.
I need to merge multiple revisions such as 71750, 72338, 72394.
Is it possible?
My code
import subprocess
p = subprocess.Popen("svn merge --dry-run -c71750 -c72238 https://URL/", stdout=subprocess.PIPE, shell=True)
output, err = p.communicate()
Output
Output is --- Merging r71750 into '.':
C /path/to/file.java
Summary of conflicts:
Text conflicts: 1
python svn svn-merge
asked Nov 14 '18 at 7:33
BromountBromount
12
I am trying to merge some specific revisions of a source branch to destination branch. Using Python script.
When I use svn merge --dry-run
range of revisions works fine. -r 72338:HEAD
Single revision works fine -c 72338.
If I use multiple revisions -c 71750 -c 72338, SVN merge is taking only first revision.
I need to merge multiple revisions such as 71750, 72338, 72394.
Is it possible?
My code
import subprocess
p = subprocess.Popen("svn merge --dry-run -c71750 -c72238 https://URL/", stdout=subprocess.PIPE, shell=True)
output, err = p.communicate()
Output
Output is --- Merging r71750 into '.':
C /path/to/file.java
Summary of conflicts:
Text conflicts: 1
python svn svn-merge
python svn svn-merge
asked Nov 14 '18 at 7:33
BromountBromount
12
asked Nov 14 '18 at 7:33
BromountBromount
12
edited Nov 14 '18 at 8:25
Bromount
asked Nov 14 '18 at 7:33
BromountBromount
12
asked Nov 14 '18 at 7:33
BromountBromount
12
asked Nov 14 '18 at 7:33
BromountBromount
12
12
-c 71750 72238is working only if the 71750 doesn't have any conflicts.
– Bromount
Nov 14 '18 at 16:44
add a comment |
-c 71750 72238is working only if the 71750 doesn't have any conflicts.
– Bromount
Nov 14 '18 at 16:44
-c 71750 72238 is working only if the 71750 doesn't have any conflicts.– Bromount
Nov 14 '18 at 16:44
-c 71750 72238 is working only if the 71750 doesn't have any conflicts.– Bromount
Nov 14 '18 at 16:44
add a comment |
1 Answer
1
active
oldest
votes
For Multiple revisions we can use -c option with a space in-between the revision numbers.
-c 71750 72238
svn merge will go to the 72338 revision Merging only if 71750 revision doesn't have any conflicts with working copy or destination.
answered Nov 14 '18 at 16:49
BromountBromount
12
add a comment |
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
);
);
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%2f53295114%2fsvn-merge-with-multiple-revisions-not-range%23new-answer', 'question_page');
);
Post as a guest
Required, but never shown
1 Answer
1
active
oldest
votes
1 Answer
1
active
oldest
votes
active
oldest
votes
active
oldest
votes
For Multiple revisions we can use -c option with a space in-between the revision numbers.
-c 71750 72238
svn merge will go to the 72338 revision Merging only if 71750 revision doesn't have any conflicts with working copy or destination.
answered Nov 14 '18 at 16:49
BromountBromount
12
add a comment |
For Multiple revisions we can use -c option with a space in-between the revision numbers.
-c 71750 72238
svn merge will go to the 72338 revision Merging only if 71750 revision doesn't have any conflicts with working copy or destination.
answered Nov 14 '18 at 16:49
BromountBromount
12
add a comment |
For Multiple revisions we can use -c option with a space in-between the revision numbers.
-c 71750 72238
svn merge will go to the 72338 revision Merging only if 71750 revision doesn't have any conflicts with working copy or destination.
answered Nov 14 '18 at 16:49
BromountBromount
12
For Multiple revisions we can use -c option with a space in-between the revision numbers.
-c 71750 72238
svn merge will go to the 72338 revision Merging only if 71750 revision doesn't have any conflicts with working copy or destination.
answered Nov 14 '18 at 16:49
BromountBromount
12
answered Nov 14 '18 at 16:49
BromountBromount
12
answered Nov 14 '18 at 16:49
BromountBromount
12
answered Nov 14 '18 at 16:49
BromountBromount
12
12
add a comment |
add a comment |
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.
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%2f53295114%2fsvn-merge-with-multiple-revisions-not-range%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
-c 71750 72238is working only if the 71750 doesn't have any conflicts.– Bromount
Nov 14 '18 at 16:44