I think you're misunderstanding me. I noted this in the conversation above: "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."
I interpreted that comment to be about something merged/integrated that should not go ahead just yet, and deserving of some consideration. I felt I had a suggestion that may be helpful to allow the release of something alpha/beta/RC-ish to go ahead even with something the team felt wasn't ready for release. To reiterate: I agree the feature is useful and I have nothing to say that I would wish to have interpreted as a concern, was trying to help speed things up not slow things down. On Thu, Nov 23, 2017 at 4:04 PM, Stefan Sperling <s...@apache.org> wrote: > 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. > -- Paul Hammant DevOps <https://devops.paulhammant.com> Let me give your enterprise a step by step plan to get out of the hell crazy branching models (ClearCase maybe?) and into the world of high-throughput CD on DevOps foundations.
