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>

> I'm trying to merge reintegrate a branch back to trunk, using
> the Reintegrate a Branch option, and I get the error:
> Command: Reintegrate merge svn://192.168.0.4/ProspectSoftDevelopment/Applications/BridgeLicensing/DllCreation/branches/V4 into
> C:\Documents and Settings\robin.guest.THORNEWIDGERY\My Documents\Delphi
> Projects\DllCreation
> Error: Cannot reintegrate from
> Error: 'svn://
> 192.168.0.4/ProspectSoft%20Development/Applications/BridgeLicensing/DllCreation/branches/V4'
>
> Error: yet:
> Error: Some revisions have been merged under it that have not been merged
> Error: into the reintegration target; merge them first, then retry.
> Finished!:
>

I'm happy to provide more information to the list, if my first post is
insufficient to enable anyone to help me.

Thank you, Robin

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-03-15 20:19:08 CET