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

Re: Understanding move merge

From: <philip_at_codematters.co.uk>
Date: 2003-01-22 21:06:13 CET

William Uther willu@cse.unsw.edu.au writes:

 The proposed move semantics need to define what happens during a
 merge when one end of a merge contains only one end of a move. I was
 thinking that it might just devolve to copy+delete semantics in this
 case (or possibly error, but devolve with a -force tag?):
[...]
 I don't think you can get away with the same approach as commits where
 you simply disallow such merges. You at least need to allow them with
 '-force'.

I certainly would not want atomic move to degenerate into delete/copy
by default, although I suppose it would be OK to have a flag to enable
that. Note that this sort of problem is not really new, there is a
similar problem when the merge source modifies a file that does not
exist in the merge target. At present attempting such a merge just
produces a not under revision control error, although perhaps we
ought to do better :)

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 14 02:06:57 2006

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