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

Re: Tree conflicts - thoughts on use cases, merging, and tests

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 11 Mar 2008 09:28:40 +0100

Hey Nico,

On Tue, Mar 11, 2008 at 01:48:09AM +0100, Nico Schellingerhout wrote:
> I agree, a move should be treated as a first class citizen: for
> detecting
> conflicts it doesn't matter, but for resolving them
> (semi)automatically, it
> does.

It does matter for detection. Detection would be much, much
easier already if we had an update editor callback like
  move_file(source, target);

See the section "TREE CONFLICT DETECTION WITH TRUE RENAMES" in
http://svn.collab.net/repos/svn/trunk/notes/tree-conflicts/detection.txt

Great to see you posting by the way. I don't have time to follow
this discussion thoroughly right now, but starting next week
I will have time to catch up and participate more actively again.

See you,

-- 
Stefan Sperling <stsp_at_elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner

  • application/pgp-signature attachment: stored
Received on 2008-03-11 09:27:56 CET

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