[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: Robin Guest <robin.guest_at_gmail.com>
Date: Mon, 16 Mar 2009 19:50:00 +0000

2009/3/16 Stefan Küng <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.

> Anyway: you can work around that by specifying a revision range for the
> merge instead of using the reintegrate feature.

Thank you, that worked perfectly. I was a bit too timid to try that on my
own, but as the documentation says, you can safely revert any merge before
you commit it.

Now I wonder if the problem was because I had some externals ("under it?!"),
to which I'd committed changes from within that working copy. The externals
were present in both the trunk and branch, but they had relocated to a
different place in the repository for the branch. Could that have been
enough to confuse reintegrate, I wonder.

Cheers, Robin


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-03-16 20:50:09 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.