On Thu, Nov 23, 2017 at 03:53:02PM -0500, Paul Hammant wrote: > > > > > > > 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. > > > > OK, so at the risk of representing *the department of unsolicited advice*, > I don't know why you would not ship with as 'off' but able to be toggled > 'on' client-side with a new option > --with-experimental-1-10-conflict-enhancement-technology > (or a better name). The 0.1% of users that want to play with it before it > is ready can do. > > - Paul
Why? There's a lot of benefits in this feature. It has been worked on sicnce May 2015 and is already pretty useful. There's a high-level description in the 1.10 release notes, have you seen that? http://subversion.apache.org/docs/release-notes/1.10.html#conflict-resolver You're a bringing your concerns up a little late :) But I'm not even sure why you would have any concerns about this.
