svn reintegrate a branch with externals fails

[dnndev]

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-un...@tortoisesvn.tigris.org].

[Alexander Iljin]

Hello!

> Anyone else having this issue?

It's probably a different issue, but can be related.
Standard repo layout, TSVN 1.6.6.
I created a short-lived branch by copying trunk to branches with renaming.
After a few revisions to the branch I selected a clean WC of the trunk, choose "Reintegrate" and selected the branch.
It worked too long and generated conflicts in totally unrelated files, so I aborted the operation, reverted the trash and did the regular merge+delete, which worked just fine.

---=====---
Alexander

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

[Bob Archer]

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

> unsub...@tortoisesvn.tigris.org].

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

[dnndev]

1) yes, i did an update after the commit at the project level.

2) As per your suggestion I tried merging the trunk to the branch, then merging back the branch to the trunk - same error message.

3) the externals are pointing to another location inside the repo. we have a shared directory that has common utils. the external is also using a specific revision.

a few other observations:
1) if i 'show log' for both folders (branch and trunk) it shows them on different revisions. Shouldn't an update bring both folders up to the same revision?

2) here is the mergeinfo
/div/vest/MergeTest/Branches/V1.5/bin:790-794
/div/vest/MergeTest/Trunk/bin:797-798*

Thank you for the help!

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

[dnndev]

This may be another clue - I have found a work-around.

you must go to branches folder, check the revision.

then go to the trunk folder, click update to a revision, check "omit externals" and put the revision number from the branches folder in the dialog box. click ok, now the merge will work as expected.

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