svn reintegrate a branch with externals fails

using svn 1.6.6 with tortoisesvn 1.6.6

what I am doing:

1) Apply external properties to a folder in the trunk (both single file and folder external, externals are binary files)

2) Create a branch from the trunk and update the entire project

3) Modify a file on the branch and commit the changes, then update the entire project.

4) Merge -> "Reintegrate a branch" when I get to the last screen I click "test merge" and get this error: Error: Cannot reintegrate into mixed-revision working copy; try updating first

I update the entire project and still the same error.

other observations:
1)If I "Merge a range of revisions" everything works fine.
2)If I remove the externals everything works fine using either "Merge a range of revisions" or "Reintegrate a branch"

Anyone else having this issue?

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2420076

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-19 17:03:28 CET