subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <...@daniel.shahaf.name>
Subject Re: Tree conflict resolution considered harmful
Date Thu, 30 Aug 2018 22:08:36 GMT
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.

I don't know how I missed this before the release, and I'm not sure
what's best to do now, but I wanted to point this out anyway.

Cheers,

Daniel

P.S. If I'd noticed this ahead of the release, I'd probably have suggested
leaving accept=postpone the default and having the output of 'merge' say
"You may want to run 'svn resolve --accept=recommended -R ./' now" at
the end.  (Come to think of it, accept=recommended could/should be the
default for 'svn resolve', couldn't it?)

Mime
View raw message