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

Re: Problems merging renamed file with contents changes

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-09-11 00:52:23 CEST

"Jon Watte" <hplus@mindcontrol.org> writes:

> I fail to see how that behavior could be anything but Very Desirable.
> Please, enlighten me (or point me at some resource where this is
> discussed in detail).

Never mind, I've been whapped about by Brane on IRC.

You're right, an atomic 'mv' concept *is* desirable, and would fix
many things.

> Also, if you have to have a two-part implementation, then I would
> suggest using copy+delete rather than delete+add, because with copy+
> delete the audit/versioning trail is typically much clearer and easier
> to follow.

Actually, when I say 'delete + add', I actually mean 'delete + copy'.
In subversion, a copy is just an "add with history". So 'svn mv'
really is tracking history right now.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 11 00:54:56 2002

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.