On Tue, 04 Jun 2013 14:09:35 +0000, Saffer, Simon wrote: ... > > A > B > > some change > > some change > > C > D > > We get no merge conflict, but the text is copied twice into the file on trunk.
So, you add one line on trunk, and a different line (and different whitespace mieans 'different') on the branch, and you expect the VCS to drop one of them? It is obvious that both changes should be taken into the merge, arguably (and usually) unless they are exactly the same, so SVN does nothing wrong here. The more interesting part is why you don't even get a conflict. Apparently the exact place you do the modification in are also far enough apart from each other so that the merge algorithm can take them as independent chunks that affect disjunct parts of the original file. You should really go and cherry-pick such changes from one branch to the other. Andreas -- "Totally trivial. Famous last words." From: Linus Torvalds <torvalds@*.org> Date: Fri, 22 Jan 2010 07:29:21 -0800
