On Tue, Jun 11, 2013 at 02:12:14PM +0200, Stefan Sperling wrote:
> On Mon, Jun 10, 2013 at 07:21:19PM +0400, Danil Shopyrin wrote:
> > The current draft of the Subversion 1.8 Release Notes announces
> > automatic tree conflicts resolution for locally moved files and
> > directories. But it seems that this feature does not actually work in
> > RC2. The detailed reproduction script is given below. I think that we
> > should either drop this feature from the release notes or provide a
> > better documentation on how to make it work.
>
> The feature is present and works as advertised. It's just not triggered
> automatically because there were objections to making decisions on
> behalf of the user.
>
> Note that this is the behaviour of 'svn' -- other clients can implement
> different behaviour and suggest or even hard-code some default option
> without asking the user.
>
> I think the problem with 'svn' is that the menu options were too hard
> to figure out. After some discussion with Ivan, I've tweaked the conflict
> prompt menu for clarity in this commit: http://svn.apache.org/r1491762
>
> Does this change settle the issue for you?
FYI, this is what the new output looks like:
$ svn up -r3
Updating '.':
C alpha
At revision 3.
Summary of conflicts:
Tree conflicts: 1
Tree conflict on 'alpha'
> local file moved away, incoming file edit upon update
Select: (mc) apply edit (recommended), (r) discard edit (breaks move),
(p) postpone, (q) quit resolution, (h) help: h
(mc) - apply incoming edit to move destination [mine-conflict]
(r) - discard edit, mark resolved, the move will become a copy
(p) - resolve the conflict later [postpone]
(q) - postpone all remaining conflicts
(h) - show this help (also '?')
Words in square brackets are the corresponding --accept option arguments.
Select: (mc) apply edit (recommended), (r) discard edit (breaks move),
(p) postpone, (q) quit resolution, (h) help: mc
U alpha2
Updated to revision 3.
Resolved conflicted state of 'alpha'
Summary of conflicts:
Tree conflicts: 0 remaining (and 1 already resolved)
$
Received on 2013-06-11 16:27:49 CEST