Test merge fails, actual merge succeeds

Hi,

I've had this situation (tortoise 1.6.3), connected to a server 1.5.X.

I merge from branch 1 to branch 2 and I select rev 71 and from 87 to 89
in the gui.

Then I test the merge and some files in 87,88,89 fail to be merged.
If I then run the actual merge everything works fine.

Is it because changes 87-89 need 71 to apply properly? And Tortoise's
Test Merge always tries to merge on the working copy.
And then, when I do the actual merge 87 is applied on top of 71?

Andrea

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-07-13 15:35:12 CEST