[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 15:44:17 +0200

On Wed, Jun 12, 2013 at 03:27:58PM +0200, Johan Corveleyn wrote:
> I'd say, just edit the moved file with the incoming content, embedded
> in conflict markers, just like what we do for text conflicts. That, I
> think, would be as good as possible.

That's basically what updating the move is doing anyway.
I wouldn't want to apply the incoming changes to the moved file
without also clearing the conflict marker.
Received on 2013-06-12 15:44:54 CEST

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