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

Robin Guest wrote:
> 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/ProspectSoft
> <http://192.168.0.4/ProspectSoft>
> Development/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
> <http://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

Some more (which you might have missed):
* the branch must have been created with an 1.5 client supporting merge
tracking
* all merges since then must have been done with an 1.5 client too

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

If you still have problems, you might want to ask on the Subversion
users list where you might get more help about merging in general.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1334411
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].