1

In descriptions of the bunny hopping workaround, it is mentioned that the approach of doing periodic merges from trunk into the same branch to later re-integrate the branch into trunk is problematic. I have experienced these issues myself (or so I thought). However, at the time I did not have time to dig deeper into them to truly understand the root causes.

Could you show a sequence of commits/merges from trunk on a single file on a feature branch that causes a branch reintegration to fail? Is that even possible? What are the main causes of failure during re-integration when using the feature branch approach?

I want to make an informed decision regarding whether to use the bunny hopping mechanism or the single branch approach.

Thanks

beluchin
  • 12,047
  • 4
  • 24
  • 35
  • 1
    My understanding is that this should only be necessary for SVN versions <= 1.4. See comment in referenced article http://designbygravity.wordpress.com/2009/10/19/what-mother-never-told-you-about-svn-branching-and-merging/#comment-174 – clstrfsck May 26 '13 at 18:25
  • "Solved" and still a mess. Just try it for yourself and with a couple of "branching/merging into the branch/merging back to trunk" cycles you would (maybe) have had enough. I also use `SVN` daily and am not happy with some aspects. I am hoever very happy with using `git` for other projects. – Borislav Sabev May 28 '13 at 11:11
  • See also: http://stackoverflow.com/questions/9835488/subversion-merge-info-how-important-is-it – exception Jan 13 '14 at 09:54

0 Answers0