[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: dnndev <tony.gomez_at_gmail.com>
Date: Mon, 30 Nov 2009 11:06:45 -0800 (PST)

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

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

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