Merge that elides explicit mergeinfo results in conflict

Hello,

Can anyone tell me why merging the elision of explicit mergeinfo would
result in a conflict, as in my test case below? I'm running
Subversion 1.6.6.

Thanks,
Justin

#!/usr/bin/env bash

## Create REPO
svnadmin create repo
URL=file://`pwd`/repo

## Checkout WC
svn co $URL wc

## Populate trunk
cd wc
mkdir branches trunk
echo hello > trunk/foo.txt
svn add branches trunk
svn ci -m "Initial commit"

## Create branches A and B
svn cp -m "Create branch A" $URL/trunk $URL/branches/A
svn cp -m "Create branch B" $URL/branches/A $URL/branches/B

## Make change on trunk
echo hello >> trunk/foo.txt
svn ci -m "Change on trunk"

## Merge from trunk/foo.txt to A/foo.txt, creating explicit mergeinfo
svn up
svn merge $URL/trunk/foo.txt branches/A/foo.txt
svn ci -m "Merge foo.txt from trunk to A"

## Merge from A/foo.txt to B/foo.txt, creating explicit mergeinfo
svn up
svn merge $URL/branches/A/foo.txt branches/B/foo.txt
svn ci -m "Merge foo.txt from A to B"

## Merge from trunk to A again, but from branch level to elide
## explicit mergeinfo from foo.txt
svn up
svn merge $URL/trunk branches/A
svn ci -m "Merge from trunk to A, eliding mergeinfo from foo.txt"

## Merge from A to B, thus merging elision of mergeinfo from foo.txt.
## A conflict results, but I don't understand why.
svn up
svn merge $URL/branches/A branches/B

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2426432

Please start new threads on the <users_at_subversion.apache.org> mailing list.
To subscribe to the new list, send an empty e-mail to <users-subscribe_at_subversion.apache.org>.
Received on 2009-12-02 19:27:22 CET