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

Re: Moving on a branch

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-02-01 15:49:50 CET

On Feb 1, 2005, at 3:11 AM, Phil Parsonage wrote:
> I've tried a dry run of this with a test repository, and it's unhappy.
> Having read various postings, it seems
> that we'd need "merge tracking" for this to work, which is a medium
> term goal on the subversion site.
> Am I correct? It's shame if I am!

No, this should work just fine. Merge tracking is needed to solve much
harder problems. But plain old 'svn merge' will deal with copies and
renames just fine. Show us a transcript of what's not working.

There is one limitation, however: Subversion doesn't yet have "true
moves". 'svn move' is really 'svn copy; svn delete'. Therefore, this
scenario is possible:

1. user A renames foo to bar on a branch.
2. user B makes changes to foo on trunk.
3. when the branch is merged to trunk,
       - the newest foo is deleted
       - bar is added (with copy history attached)

The problem is that bar represents an older version of foo. If
Subversion had "true renames", then the merge procedure would actually
*move* the newest trunk foo to bar, rather than do a delete & add.

Is this, perhaps, the problem you've run into?

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 1 15:53:04 2005

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

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