[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: Wed, 12 Jun 2013 14:00:53 +0200

On Wed, Jun 12, 2013 at 02:59:26PM +0400, Danil Shopyrin wrote:
> The new prompt menu makes a great improvement. The most important part
> is that 'apply edit' action is marked as 'recommended'.

I've gone one step further and removed the non-recommended option
from the prompt. It now looks like this:

> local file moved away, incoming file edit upon update
   Select: (mc) apply update to move destination, (p) postpone,
           (q) quit resolution, (h) help:

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

Yes, but not in 1.8. We're too late in the release cycle for that.
To do this properly we need to enhance the APIs. See my reply to
Johan about this.

> 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.

We could introduce a concept of conflicts which are 'trivial' to
resolve. I think it makes sense to treat these situations as tree
conflicts in the the implementation and also parts of the UI,
because storing and displaying information about them seperately
from other tree conflicts would be awkward.
Received on 2013-06-12 14:01:30 CEST

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