subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Danil Shopyrin <da...@visualsvn.com>
Subject Re: Automatic tree conflicts resolution during svn update
Date Wed, 12 Jun 2013 10:59:26 GMT
On Tue, Jun 11, 2013 at 4:12 PM, Stefan Sperling <stsp@elego.de> wrote:
> 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?

The new prompt menu makes a great improvement. The most important part
is that 'apply edit' action is marked as 'recommended'.

But is it possible to make the solution even better and apply edits
automatically without prompting users?

Also I agree with the idea that this case is not a real "tree
conflict" (from the user's point of view). The real "tree conflict" is
when user renames 'Program.cs' to 'SuperProgram.cs' while the file is
already renamed to 'MegaProgram.cs' in the repository. The discussed
use case is much simpler and it's not treated as a conflict by most of
the users.

So I propose to apply edits automatically to all files renamed in the
working copy (except the possible edge cases, of course). Users who
don't want edits to be applied automatically can run 'svn update' with
the '--accept=postpone' option. But I expect that most of the users
will be happy with the automatic behavior.

-- 
With best regards,
Danil Shopyrin
VisualSVN Team

Mime
View raw message