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

RE: svn reintegrate a branch with externals fails

From: Bob Archer <bob.archer_at_amsi.com>
Date: Fri, 20 Nov 2009 10:33:18 -0500

> what I am doing:
>
> 1) Apply external properties to a folder in the trunk (both single
> file and folder external, externals are binary files)

You did an update after this commit?

>
> 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.
>

Here you should merged from trunk into branch. I know you didn't actually change anything on trunk.... but perhaps --reintegrate requires merge info on the branch in order to work properly. This is the expected workflow.

> 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"

Are the externals pointing to a place in the trunk? Or, what?

BOb

>
> Anyone else having this issue?
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMe
> ssageId=2420395
>
> To unsubscribe from this discussion, e-mail: [users-
> unsubscribe_at_tortoisesvn.tigris.org].

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-20 16:33:29 CET

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