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

Re: Some revisions have been merged under it that have not been merged into the reintegration target

From: Mike Dixon <michael.dixon_at_denovosoftware.com>
Date: Mon, 16 Mar 2009 13:49:17 -0700

Robin Guest wrote:
> 2009/3/16 Stefan K√ľng <tortoisesvn_at_gmail.com
> <mailto:tortoisesvn_at_gmail.com>>
> Robin Guest wrote:
> > Error: Some revisions have been merged under it that have not
> been merged
> > Error: into the reintegration target; merge them first, then retry.
Short story: This has been fixed already, but you're not using the
latest version.

Long story: This error used to be raised when you have svn:mergeinfo
properties on any files or folders in your branch, not including the
merge source (AKA "it").

Example: Reintegrating "http://server/svn/repo/branches/foo" into
/trunk has mergeinfo
/trunk/bar has mergeinfo
/branches/foo has mergeinfo ---> no error.
/branches/foo/bar svn:mergeinfo ---> error.

The reason there's an error is because the presence of svn:mergeinfo on
/branches/foo/bar means that it might have different mergeinfo than
/branches/foo, which would make it impossible for reintegrate to figure
out what to do.

In practice, 99% of the time the reason /foo/bar has mergeinfo is
because it was copied or renamed at some point, and it has the exact
same svn:mergeinfo property as /foo. The most recent version of
subversion is a lot smarter about looking at the actual values of
svn:mergeinfo properties during reintegrate, and so you likely won't see
the error anymore if you upgrade.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-03-16 21:49:28 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.