Error: PROPFIND request failed on merge

I am getting some weirdness when i merge.. I have 2 tree's 1 is main(trunk) the other is a release that had some changes done to it after it branched. Development continued in both branches. Now i want to merge the changes to the release branch back into main.

I have already merged in all the changes made to main since branching and am now trying to merge back..

I merged changes into FB @r39518

I now wish to merge the FB back into main. This is what we call a type 2 as in 5.17.2. Merging Two Different Trees of the tortoise help.

It says to specify the revision at which the 2 trees where sync so for the top i enter the rev main was last committed to (and i syncd from) 39487 and the bottom i enter the revision that i brought the changes from main into my branch at 39518.

when i dry run.. it works fine.. but when i actually run..

i get the following error:

Error: PROPFIND request failed on '/repositories/Claybrook/!svn/vcc/default'

it seems abit intermittent actually.. and the path varies. For example i have just run it 3 times.. exactly the same setting and it failed twice.. succeeded once..?

I can see no errors of note in my logs either..

any suggestions?

-----------------------
N: Jon Hardcastle
E: Jon_at_eHardcastle.com
'The writing is on the wall...'
-----------------------

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-05-12 13:07:24 CEST