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

Re: merge with tree conflict

From: Tyler Roscoe <tyler_at_cryptio.net>
Date: Wed, 30 Sep 2009 07:44:05 -0700

On Wed, Sep 30, 2009 at 06:27:39AM -0700, Vadym Chepkov wrote:
> finally we got to the point. now lets go to product directory again and apply the same exactly merge we did with revision 6
> $ svn merge ^/vendor/1.0 ^/vendor/current .
> $ svn diff
> Property changes on: .
> ___________________________________________________________________
> Modified: svn:mergeinfo
> Merged /vendor/current:r6-7
> As you can see, svn:merginfo was updated yet again, even though nothing was changed under /vendor/ in revisions 6 and 7

Yes, this is correct. Subversion has to track the fact that you already
merged revs 6 and 7 into your "current" branch. Whether there were
actual code changes in those revs is irrelevant.

The topic of "phantom" changes to mergeinfo on seemingly unrelated
merges has been discussed many, many times on this list. Look through
the archives for more examples.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-30 16:44:50 CEST

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.