[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: Greg Stein <gstein_at_lyra.org>
Date: 2002-09-11 00:45:38 CEST

On Tue, Sep 10, 2002 at 03:11:15PM -0700, Jon Watte wrote:
>...
> I went through the various hacking/readmes and the issue tracker,
> and couldn't find any issue documenting a feature request that
> renames be handled as a primitive operation (instead of being
> simulated with two operations). Is this already on the plate, or
> should I file an issue about it? The description in "goals" seems
> to imply that this is the implementation necessary in the end, but
> I'm confused about not seeing it mentioned anywhere else.

Another problem with rename/move not being a primitive is that we don't see
conflicts with renames:

joe$ svn mv FOO BAR
joe$ svn commit

bob$ svn mv FOO BAZ
bob$ svn commit

(as I recall, we see that a delete of FOO already occurred, so a merge of
 that deletion is marked as "fine")

Now you have no FOO files, but a BAR and a BAZ. I would consider bob's move
to be a failure since the file he was trying to rename was moved
differently.

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
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:46:24 2002

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