[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 11:59:33 +0200

On Wed, Jun 12, 2013 at 08:47:32AM +0200, Bert Huijben wrote:
> At the time we are resolving the BASE nodes at the original location have
> been updated to the target revision, but the place that the code has been
> moved to is still at the old revision.
>
> Doing nothing keeps you in a state where the move is broken... And choosing
> mark as resolved will remove the move information that makes a move a proper
> copy (of the old version)+delete
 
Yes, that's correct.
The original text said 'apply update', not 'apply edit'. Ivan said
that 'apply edit' is clearer, but perhaps it is also confusing?
Should we say 'apply update' instead of 'apply edit'?

> The other option is updating the move target, to make it match the new
> moved-from revision.

And we have special notifications to signal when a move is broken, too.
Received on 2013-06-12 12:00:17 CEST

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