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

RE: svn merge lies?

From: Reedick, Andrew <Andrew.Reedick_at_BellSouth.com>
Date: 2006-07-12 00:30:37 CEST

> -----Original Message-----
> From: rooneg@gmail.com [mailto:rooneg@gmail.com] On Behalf Of
> Garrett Rooney
> You might want to try out the 1.4.x branch
> (release candidate coming real soon now!) and see if it fixes the
> issue.
> -garrett

Ugh, I was right for at least 1.3.0. I'll have to check on 1.4 later.

It is an evil_twin/add+delete problem:
        Create trunk.
        Branch from trunk
        'svn add' foo.java to trunk
        'svn add' foo.java to branch
        Merge branch to trunk
                a) 'svn merge' outputs an 'A' to represent the object
                b) does a merge conflict (since the file contents of the
objects are different)

> If you can find a simple reproduction recipie that would be great...

Create a test repository and run this script:

## change me!!

## Create trunk, and create branch from trunk
svn mkdir -m "created trunk" $URL/trunk
svn copy -m "copied branch" $URL/trunk $URL/branch

## Create a workspace
svn co $URL test
cd test

## Create trunk version of foo.java
echo "This is the trunk" > trunk/foo.java
svn add trunk/foo.java
svn commit -m "added trunk/foo.java"

svn update

## Create branch version of foo.java
echo "This is the branch" > branch/foo.java
svn add branch/foo.java
svn commit -m "added branch/foo.java"

svn update

## Do the merge. Merge from branch to trunk.
cd ..
svn co $URL/trunk merge

cd merge

## Find out where we're merging from
svn log -v --stop-on-copy $URL/trunk

svn log -v --stop-on-copy $URL/branch

svn merge -r 2:4 $URL/branch

svn status

Sample Output:

/tmp/andrew/bug/merge:svn merge -r 2:4 svn://server/repos/branch
A foo.java

/tmp/andrew/bug/merge:svn status
? foo.java.merge-right.r4
? foo.java.working
? foo.java.merge-left.r0
C foo.java


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. 163

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jul 12 00:32:03 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.