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

Re: Automatic tree conflicts resolution during svn update

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 11 Jun 2013 14:12:14 +0200

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?
Received on 2013-06-11 14:12:52 CEST

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