E-COM-NET

Question

I've got two branches (children of trunk) that need to be merged into one branch for testing, but they can't go into trunk. Both branches are up-to-date with trunk@HEAD. So I want to go from this:

__________________trunk
  \___duck   \
              \___beaver

to this:

__________________________trunk
  \
   \______________platypus

I created the branch platypus from the latest version of trunk, and am trying to merge duck and beaver into this new copy of trunk:

svn copy ^/trunk ^/branches/platypus;
svn switch ^/branches/platypus;
svn merge --reintegrate ^/branches/duck;
svn merge --reintegrate ^/branches/beaver;

but the merge ops fail

svn: '/blah/!svn/bc/12047/repo/branches/duck' path not found

If I try to --reintegrate duck (or beaver) into trunk it works fine. What am I missing here?

duck, beaver, plutypus - very funny – Konstantin Feb 18 at 10:40

wardies 533 4 9 · Accepted Answer · Sep 3 '14 at 8:24

I had the same error and was able to solve it by manually specifying all of the revision numbers I wanted to merge rather than letting SVN decide. This allowed the merge to continue and prompted me for merge conflicts, as expected.

I was using TortoiseSVN to pick the revisions by hand but I presume using the SVN command line it would be something like:

svn log --stop-on-copy https://svn.blah/svn/proj1/branches/xyz

Then note down all the revision numbers and merge them all in one go, e.g.:

svn merge -c123,124,156,159 https://svn.blah/svn/proj1/branches/xyz

Anshu 9,907 4 25 40 · Answer 2 · Oct 3 '12 at 5:24

up vote 0 down vote

Try using the --ignore-ancestry option when doing the merge. It could be the merge history is incomplete (possibly due to tortoise or any client for that fact) and something that was done on branch is trying to be applied to the working copy when you do a 'normal' merge.

answered Oct 3 '12 at 5:24

Anshu

9,907 4 25 40

1

Thanks but that doesn't work. You can't use --reintegrate and --ignore-ancestry at the same time and a merge without --reintegrate just creates a ton of conflicts because both branches have the same trunk – MatW Oct 3 '12 at 5:36

add a comment

andrew lorien 126 1 7 · Answer 3 · Jun 30 '14 at 3:47

I had a similar problem reintegrating a branch which had been merged from another branch (itself now reintegrated). Like this:

-----------------------------r7------------------
  \                         /             /ERROR !svn/bc/4/repo/branches/duck' path not found
   r1----dinosaur--r5-------             /
                    \---duck------------r9

It doesn't seem to be possible to reintegrate duck, the path not found error complained about r4 - but i could merge specific revisions (r5-r9) from duck back to trunk.

Stephen Kennedy 3,429 3 26 48 · Answer 4 · Oct 10 '14 at 13:52

I resolved this as follows:

Merged the problematic branches into trunk
Created new "consolidated" branch from trunk
Reverted trunk to its state prior to step 1 and committed the reversion
Merged record only from step 3 into branch
Tested by merging new consolidated branch back to trunk, but did not commit it of course

End result is a new branch containing the changes from the feature branches and trunk unchanged (but alas with some new entries in the log).

Answer 5

来自stackovewflow:

score 12 · Accepted Answer · Oct 3 '12 at 12:30

12 down vote favorite

2

I've got two branches (children of trunk) that need to be merged into one branch for testing, but they can't go into trunk. Both branches are up-to-date with trunk@HEAD. So I want to go from this:

__________________trunk
  \___duck   \
              \___beaver

to this:

__________________________trunk
  \
   \______________platypus

I created the branch platypus from the latest version of trunk, and am trying to merge duck and beaver into this new copy of trunk:

svn copy ^/trunk ^/branches/platypus;
svn switch ^/branches/platypus;
svn merge --reintegrate ^/branches/duck;
svn merge --reintegrate ^/branches/beaver;

but the merge ops fail

svn: '/blah/!svn/bc/12047/repo/branches/duck' path not found

If I try to --reintegrate duck (or beaver) into trunk it works fine. What am I missing here?

edited Oct 3 '12 at 12:30

asked Oct 3 '12 at 5:15

MatW

5,261 1 26 51

duck, beaver, plutypus - very funny – Konstantin Feb 18 at 10:40

add a comment

4 Answers

active oldest votes

up vote 13 down vote accepted

I had the same error and was able to solve it by manually specifying all of the revision numbers I wanted to merge rather than letting SVN decide. This allowed the merge to continue and prompted me for merge conflicts, as expected.

I was using TortoiseSVN to pick the revisions by hand but I presume using the SVN command line it would be something like:

svn log --stop-on-copy https://svn.blah/svn/proj1/branches/xyz

Then note down all the revision numbers and merge them all in one go, e.g.:

svn merge -c123,124,156,159 https://svn.blah/svn/proj1/branches/xyz

answered Sep 3 '14 at 8:24

wardies

533 4 9

add a comment

up vote 0 down vote

Try using the --ignore-ancestry option when doing the merge. It could be the merge history is incomplete (possibly due to tortoise or any client for that fact) and something that was done on branch is trying to be applied to the working copy when you do a 'normal' merge.

answered Oct 3 '12 at 5:24

Anshu

9,907 4 25 40

1

Thanks but that doesn't work. You can't use --reintegrate and --ignore-ancestry at the same time and a merge without --reintegrate just creates a ton of conflicts because both branches have the same trunk – MatW Oct 3 '12 at 5:36

add a comment

up vote 0 down vote

I had a similar problem reintegrating a branch which had been merged from another branch (itself now reintegrated). Like this:

-----------------------------r7------------------
  \                         /             /ERROR !svn/bc/4/repo/branches/duck' path not found
   r1----dinosaur--r5-------             /
                    \---duck------------r9

It doesn't seem to be possible to reintegrate duck, the path not found error complained about r4 - but i could merge specific revisions (r5-r9) from duck back to trunk.

answered Jun 30 '14 at 3:47

andrew lorien

126 1 7

add a comment

http://stackoverflow.com/questions/12702284/svn-merge-between-two-branches-path-not-found

wardies 533 4 9 · Accepted Answer · Sep 3 '14 at 8:24

I had the same error and was able to solve it by manually specifying all of the revision numbers I wanted to merge rather than letting SVN decide. This allowed the merge to continue and prompted me for merge conflicts, as expected.

I was using TortoiseSVN to pick the revisions by hand but I presume using the SVN command line it would be something like:

svn log --stop-on-copy https://svn.blah/svn/proj1/branches/xyz

Then note down all the revision numbers and merge them all in one go, e.g.:

svn merge -c123,124,156,159 https://svn.blah/svn/proj1/branches/xyz

Anshu 9,907 4 25 40 · Answer 8 · Oct 3 '12 at 5:24

up vote 0 down vote

Try using the --ignore-ancestry option when doing the merge. It could be the merge history is incomplete (possibly due to tortoise or any client for that fact) and something that was done on branch is trying to be applied to the working copy when you do a 'normal' merge.

answered Oct 3 '12 at 5:24

Anshu

9,907 4 25 40

1

Thanks but that doesn't work. You can't use --reintegrate and --ignore-ancestry at the same time and a merge without --reintegrate just creates a ton of conflicts because both branches have the same trunk – MatW Oct 3 '12 at 5:36

add a comment

andrew lorien 126 1 7 · Answer 9 · Jun 30 '14 at 3:47

I had a similar problem reintegrating a branch which had been merged from another branch (itself now reintegrated). Like this:

-----------------------------r7------------------
  \                         /             /ERROR !svn/bc/4/repo/branches/duck' path not found
   r1----dinosaur--r5-------             /
                    \---duck------------r9

It doesn't seem to be possible to reintegrate duck, the path not found error complained about r4 - but i could merge specific revisions (r5-r9) from duck back to trunk.

wardies 533 4 9 · Accepted Answer · Sep 3 '14 at 8:24

I had the same error and was able to solve it by manually specifying all of the revision numbers I wanted to merge rather than letting SVN decide. This allowed the merge to continue and prompted me for merge conflicts, as expected.

I was using TortoiseSVN to pick the revisions by hand but I presume using the SVN command line it would be something like:

svn log --stop-on-copy https://svn.blah/svn/proj1/branches/xyz

Then note down all the revision numbers and merge them all in one go, e.g.:

svn merge -c123,124,156,159 https://svn.blah/svn/proj1/branches/xyz

Anshu 9,907 4 25 40 · Answer 11 · Oct 3 '12 at 5:24

up vote 0 down vote

Try using the --ignore-ancestry option when doing the merge. It could be the merge history is incomplete (possibly due to tortoise or any client for that fact) and something that was done on branch is trying to be applied to the working copy when you do a 'normal' merge.

answered Oct 3 '12 at 5:24

Anshu

9,907 4 25 40

1

Thanks but that doesn't work. You can't use --reintegrate and --ignore-ancestry at the same time and a merge without --reintegrate just creates a ton of conflicts because both branches have the same trunk – MatW Oct 3 '12 at 5:36

add a comment

andrew lorien 126 1 7 · Answer 12 · Jun 30 '14 at 3:47

I had a similar problem reintegrating a branch which had been merged from another branch (itself now reintegrated). Like this:

-----------------------------r7------------------
  \                         /             /ERROR !svn/bc/4/repo/branches/duck' path not found
   r1----dinosaur--r5-------             /
                    \---duck------------r9

It doesn't seem to be possible to reintegrate duck, the path not found error complained about r4 - but i could merge specific revisions (r5-r9) from duck back to trunk.

Stephen Kennedy 3,429 3 26 48 · Answer 13 · Oct 10 '14 at 13:52

I resolved this as follows:

Merged the problematic branches into trunk
Created new "consolidated" branch from trunk
Reverted trunk to its state prior to step 1 and committed the reversion
Merged record only from step 3 into branch
Tested by merging new consolidated branch back to trunk, but did not commit it of course

End result is a new branch containing the changes from the feature branches and trunk unchanged (but alas with some new entries in the log).

SVN merge between two branches - “path not found”

4 Answers

4 Answers

4 Answers

你可能感兴趣的:(svn,svn)