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

Merging renamed files. Bug? Feature Gap? Other?

From: Reedick, Andrew <Andrew.Reedick_at_BellSouth.com>
Date: 2006-10-05 20:07:12 CEST

This issue came up on

Here's the post:
        "Two parallel branches exist (one may be doing rapid releases,
the other may be working on a major change that will take a while). In
one of the branches, files are refactored and the name of a file is
changed. What happens when one stream needs to merge into the other?
Does the tool know that the two are the same file and merge them, or are
they considered separate files and not merged?"

After a quick test, the answer appears to be 'considered separate files
and not merged'. In theory, this means work is lost.
1. Create trunk/foo.txt
2. svn copy trunk branch
3. commit changes to branch/foo.txt
4. commit changes to trunk/foo.txt (to force a merge conflict)
5. ren branch/foo.txt to branch/bar.txt
6. merge from branch to trunk.

In theory, trunk/foo.txt and branch/bar.txt are the same. (From a
developer point of view, and from an ancestry point of view.)

In reality, subversion sees them as separate objects, so svn merge will
      A bar.txt
        D foo.txt
Since trunk/foo.txt gets deleted, any changes made to trunk/foo.txt are
lost. The trunk/foo.txt is not merged with trunk/bar.txt, even though
foo.txt is the ancestor of bar.txt.

Am I correct in how I stated this? And is this a bug or a feature? I'm
starting to get a queasy feeling about this scenario. Is it worth
worrying about?


The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA623

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Oct 5 20:08:20 2006

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.