Reintegrate a branch problem

I finished a feature branch, and all changes in the trunk have been
merged to it. Now I want to merge it back to the trunk.

My SVN Server is VisualSVN Server 1.6.1.

First I switched back to the trunk.
Then I choosed "Reintegrate a branch" and select branch_FEATURE.
All merge options are keeped with their original values.

And after I clicked "Merge" button, it displays a error:

Command: Reintegrate merge https://fs1:8443/svn/Web/branch_FEATURE
into D:\Projects\Web
Error: Reintegrate can only be used if revisions 2385 through 2456
were previously
Error: merged from https://fs1:8443/svn/Web/trunk to the reintegrate
source, but
Error: this is not the case:
Error: branch_FEATURE/Web/Events/AppointExam/index.htm
Error: Missing ranges: /trunk/Web/Events/AppointExam/index.htm:
2385-2455
(...more...)
Finished!:

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-09 11:29:36 CET