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

Re: Merge that elides explicit mergeinfo results in conflict

From: Justin Johnson <justin_at_honesthacker.com>
Date: Mon, 7 Dec 2009 08:13:25 -0600

On Wed, Dec 2, 2009 at 12:26 PM, Justin Johnson <justin_at_honesthacker.com> wrote:
> 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
>

Can anyone explain this behavior to me?

Thanks,
Justin

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

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-07 15:14:35 CET

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.