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

svn reintegrate a branch with externals fails

From: dnndev <tony.gomez_at_gmail.com>
Date: Thu, 19 Nov 2009 21:11:05 -0800 (PST)

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://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2420395

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-20 07:46:06 CET

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