On Thu, Nov 23, 2017 at 10:55:02AM -0500, Paul Hammant wrote: > > > > > > One conflict option that's not done yet is one that merges a textual change > > from a path ^/trunk/B to a path ^/branch/A, after a move A -> B on trunk. > > I don't consider this a release blocker. We can always add this option in > > a patch release. > > > > > Is that a regression versus v1.9 and before?
Far from it. This discussion is about the new conflict resovler added in 1.10. We can and always could perform such merges by manually specifying the paths, i.e. running a merge from ^/trunk/B to branch/A. The goal of the resolver is to make it easier to perform such merges in the straightforward 'svn merge ^/trunk' style.
