Clever Geek Handbook

Svn merge error when one branch needs to be linked to another

I have two branches that were created from the trunk.

For the 2.1 branch, this branch was copied from trunk

For branch 2.2:

  • First the V2.2 branch folder was created and added.
  • The second part of the copy was done in V2.2 /. So the actual branch is actually the "code" folder.
  • the "code" was subsequently moved back to the V2.2 root folder. The end effect is that at this point, both branches (V2.1 and V2.2) appear to be identical.

Here is the problem, when we merge the V2.1 branch into the V2.2 branch, we get the message: https://svn.mycorp.com/svn/star/branches/ V2.1@49058 should be linked to https: // svn. mycorp.com/svn/star/branches/ V2.2@49040

Any idea how to combine this code? I tried to create a "code" folder under the V2.2 branch and SVN moved all the code back, but the same result when I try to merge V2.1 into the V2.2 / code folder.

Any help would be greatly appreciated

+4


source to share


1 answer


Try the parameter --ignore-ancestry

svn merge

.



This option ignores merge information as well as history, so you need to manually select versions to merge. SVN will not determine which changes to merge automatically.

0


source






More articles:


All Articles