Re: Merging confuses renamed files

Jack Repenning <jrepenning@collab.net> writes:

> "His repository." "Her repository." Are you really talking about two
> separate repositories, John? Your examples are all from Sue's
> perspective, and refer to "her repository" only as ".". But if you
> really mean that she has a separate repository, then it must be named
> something like "http://foo.com/elsewhere", right?

I don't quite follow your question, but I can state that from the
example, "." is *NOT* a working copy of http://foo.com/somewhere. It
could be a working copy at file:///home/alice/alicerepos.

So yes, we are dealing with different repositories.

> In that case, I think the answer to your question is "Subversion does
> not maintain history between repositories." The fact that Sue's
> foo.py once came from Bob's is not recorded; the merge only knows that
> Bob has a "bar.py," and Sue does not.

I understand that. But both the "before" and the "after" for the
merge come from Bob and are being recorded in Sue's repository. That
is, svn merge knows that this is a rename and -- even though it has no
idea where the wc data originated -- should execute the same operation
locally to apply it.

At a slightly lower level, I know that a rename is an svn cp followed
by svn rm. Locally, it should svn cp foo.py bar.py and then svn rm
foo.py. This would preserve the local changes across renames.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 22 21:54:23 2003