On 06/11/2013 05:42 PM, 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?
when we say, "svn update, svn switch, and svn resolve can now
'automatically' resolve
tree conflicts involving locally moved files or directories.", one would
not expect to see a menu thrown in front of them (with trivial questions)..
What I would think of in this case is the "incoming edit" me applied
against the "local-move"d file and just say,
Resolved conflicted state of 'dir1/file1'
Summary of conflicts:
Tree conflicts: 0 remaining (and 1 already resolved)
Just my thoughts.. Not sure if it makes sense with respect to our
current code.
--Prabhugs
