[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Help with merging!

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Wed, 18 Jun 2008 23:56:52 +0100

2008/6/18 Robert Dailey <rcdailey_at_gmail.com>:
> Hi,
>
> I'm using TSVN 1.5 and I'm trying to merge a feature branch of mine to the
> main trunk. I've merged all of the trunk revisions to my feature branch (at
> least the ones after the initial branch revision). I choose "Reintegrate
> Branch" from the merge dialog and when I click "Test merge" I get:
>
> Command: Reintegrate merge
> svn://teamserver/svn/investor_demo/branches/rcd_emfx/client into
> C:\IT\vfx\investor_demo\client
> Error: Cannot reintegrate from
> Error: 'svn://teamserver/svn/investor_demo/branches/rcd_emfx/client' yet:
> Error: Some revisions have been merged under it that have not been merged
> Error: into the reintegration target; merge them first, then retry.
>
>
> What does this mean? The error message makes no sense to me...
>

The error message comes from the server, not from TSVN. The
reintegrate function is not bomb proof and has some well known
(although not well known to me) limitations. I believe renaming files
is one action that can cause problems. Try asking on the
users_at_subversion mailing list, or the merge tracking forum at
collabnet.

Simon

-- 
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-06-19 00:57:30 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.