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

2009/3/15 Robin Guest <robin.guest_at_gmail.com>

> Error: Some revisions have been merged under it that have not been merged
>> Error: into the reintegration target; merge them first, then retry.
>> I'm happy to provide more information to the list, if my first post is
>> insufficient to enable anyone to help me.
>>
>
In the meantime I started to make a list of questions about the things that
don't make sense in the error message:

1) What is "it"?
2) What is "the reintegration target"?
3) What does "merged under" mean?
4) What command should I do to get it to tell me me those revisions have
been "merged under" "it" that have not been merged into "the reintegration
target"?
5) Once I've found out those revisions, how do I merge them, given that I
think I've merged everything I possibly can apart from this failing merge?

If "it" is the branch and "the reintegration target" is the trunk and
"merged under" means a merge from the branch to the trunk, then I can't see
how that is true - all revisions in the branch have been either merged from
the trunk or committed directly there. A merge from the branch to the trunk
is exactly what I'm trying to do now.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1332185

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