6

I am a bit curious on how the merge info in Subversion is used, and what kind of problems one can run into if the merge info is incorrect?

For example, I have branched branch1 and branch2 from trunk. I also have a subbranch1 and a subbranch2 originating from branch1. Consider I've done some development in branch2, and then reintegrated it back to trunk using svn merge --reintegrate ^/branch2. I then wanted to add these changes to subbranch1 as well (pulling them from trunk) and mistakenly used command, svn merge --reintegrate ^/trunk (thus adding the --reintegrate flag to the merge command here too, even though subbranch1 is not an immediate ancestor of trunk).

What problems can this cause in the future?

bahrep
  • 29,961
  • 12
  • 103
  • 150
joscarsson
  • 4,789
  • 4
  • 35
  • 43

2 Answers2

3

Merge info keeps track of this information:

  • The relations between branches (subbranch1 originated from branch1, which originated from trunk, etc.)
  • Which revisions have been already merged

If the merge info is missing or incorrect, you would have to track merges manually, and this could be error prone. By using merge info, you just let Subversion keep track of all this information.

Christian Strempfer
  • 7,291
  • 6
  • 50
  • 75
Danilo Piazzalunga
  • 7,590
  • 5
  • 49
  • 75
2

This answer is deprecated. Please use Subversion >= 1.6.

You're branching approach is dangerous in general, but because of the accident it's even worse.

You'll get much problems when reintraging all the branches.

  • changes made by branch2 might look like deletions to subversion.
  • deletions made by you might look like additions to subversion.
  • the three-way-comparsion might give you odd results (putting the same piece of code twice into the file for example)

You cannot trust the three-way-comparsion anymore, you have to check each change manually!

See What mother never told you about svn branching and merging for more information.

P.S. I had to fix something like this once. Since then we use bunny hopping (see link).

Christian Strempfer
  • 7,291
  • 6
  • 50
  • 75
  • Re the blog post, I don't think Bunny Hopping is necessary since SVN 1.5, which keeps track of this kind of stuff for you. – hdgarrood Jul 09 '12 at 14:52
  • SVN 1.5 fixed some problems, but if you do a lot of merging and branching you'll get into trouble. – Christian Strempfer Sep 19 '12 at 06:48
  • The bunny-hop is not required. It's a workaround for bad SVN practices. Why do people expect merging to be simple if they're going to do LOTS of changes to trunk AND a branch? (Particularly over the same code!) – exception Jan 13 '14 at 09:42
  • @exception: No, it's not required and you're right that it's a workaround for wrong usage. But bunny-hopping worked for large teams with members who don't really understand branching. It's just a pragmatic solution. The question contains a good example that there will happen mistakes sometimes, which are difficult to solve afterwards. Hopefully people will use Subversion >= 1.6 finally... – Christian Strempfer Jan 13 '14 at 18:34
  • We have many working branches and use SVN due to company standards. I can confirm based on our team's experience that this approach to branching makes experience with SVN pretty much easier. – ninjaboy Jul 09 '15 at 16:25