Re: Request of improvement of the merge preparation

On 26.02.2011 10:44, Torge Riedel wrote:
> This is the message shown in the merge window in the output list:
>
> Action | Path
> --------------------------------------------------------------------------------------------
> Command | Reintegrate merge https://xx.xx.xx.xx/svn/repo/branches into C:\sandboxes\repo
> Error | Cannot reintegrate into mixed-revision working copy; try updating first
> Finished! |
>
> I can always reproduce this by doing the following:
>
> 1. Having already a local working copy from "trunk".
> 2. Use "Copy to" in repo browser to create a branch from "trunk" to svn-directory "branches".
> 3. Create local working copy of this branch.
> 4. Do the modifications and check them in.
> 5. Then use the "Merge" command to merge the branch to your working copy of "trunk"
>
> This it the time, where I get the error above. I then need to do an SVN Update on the working copy of "trunk", before it is possible to merge.

Filed an issue for this:
http://code.google.com/p/tortoisesvn/issues/detail?id=69

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=2707778
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].