Help with merging!

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...
Received on 2008-06-18 23:06:36 CEST