[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Tree conflict resolution considered harmful

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Mon, 03 Sep 2018 13:34:02 +0000

[moved from users@; https://svn.haxx.se/users/archive-2018-08/0052.shtml]

In a nutshell, it concerns me that passing --non-interactive changes the
default value of --accept. I think --non-interactive should use the
same algorithm and have the same results as interactive merges.

Sorry for being so brief. I do have more to say but don't have time to
edit it into coherency (something unexpected has come up). Thanks for
your detailed response.


Stefan Sperling wrote on Fri, 31 Aug 2018 11:41 +0200:
> On Thu, Aug 30, 2018 at 10:08:36PM +0000, Daniel Shahaf wrote:
> > Stefan Sperling wrote on Thu, 30 Aug 2018 14:06 +0200:
> > > In --non-interactive mode the default value for --accept is 'recommended'.
> >
> > This is a backwards incompatible change to the semantics of `svn merge
> > --non-interactive` (with no other --option flags): A workflow designed
> > under 1.9 and trusting svn to obey PEP 20's "In the face of ambiguity,
> > refuse the temptation to guess" will find that 1.10 no longer obeys
> > that.
> Which facts lead you to this conclusion?
> [...snip several paragraphs...]
Received on 2018-09-03 15:34:18 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.