I'm using TortoiseSVN 1.5.4.14259 on XP SP2, for Subversion 1.5.3
Windows Server 2003.
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!:
From the documentation: "There are some conditions which apply to a
reintegrate merge. Firstly, the server must support merge tracking. The
working copy must be of depth infinite (no sparse checkouts), and it must
not have any local modifications, switched items or items that have been
updated to revisions other than HEAD. All changes to trunk made during
branch development must have been merged across to the branch (or marked as
having been merged). The range of revisions to merge will be calculated
automatically."
Firstly, the server must support merge tracking. 1.5.3, YES I THINK SO
The working copy must be of depth infinite YES
(no sparse checkouts) NO
and it must not have any local modifications NO
switched items NO
or items that have been updated to revisions other than HEAD NO
All changes to trunk made during branch development must have been merged
across to the branch YES
(or marked as having been merged) NONE OF THOSE
There were only three revisions made to trunk since the branch was created,
all done by me, and all successfully merged into the branch as I went
along. There is another separate branch made from trunk before I made mine,
but the dev is not nearly ready to reintegrate his yet.
Feeling a bit panicky at the moment because this is my first merge, and
there is a fair bit of work invested in that branch, but hopefully the fix
is something simple.
Please advise. Thanks, Robin
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1323855
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-03-15 01:01:30 CET