RE: Re: Error Merging Branch to Working Base

Hi Stephan. Here are the steps I follow

I have performed a Tortoisesvn -> switch and switched my working copy to my trunk.

From there I did a tortoisesvn -> merge. I selected reintegrate branch. My From URL is http://xxx.xxx.xxx.xx/svn/Crosby%20CMS/branches/Lite_1_1 and my working copy is my local disk location C:\documents and Settings etc... I then click next and select "Working Copy" as my merge depth and keep everything else as default.

When I do a test merge. I receive the error and then I receive the same error when I try the actual merge as well.

Thanks

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2008-12-15 16:20:48 CET