Re: Error Merging Branch to Working Base

rgf207_at_myactv.net wrote:
> 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.

Can you try a merge "range of revisions" instead of a "reintegrate" and
specify the full revision range (start revision from where the branch
was created to HEAD)?
Reintegrating still has some quirks which should get fixed in svn 1.6.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=984554
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].