Re: Moving files between folders in repo-browser; revision history lost?

On 01.02.2010 20:21, Andrew Cushen wrote:

> < Sure, you've replaced the trunk. The dev branch you originally created
> < is ancestrally related to the original trunk, not the new one you
> < created. Use the merge dialog and check the box "ignore ancestry" on the
> < last page of the merge wizard.
>
> OK, I tried this, again with Merge Depth to "Fully recursive", and also to
> "Working
> copy" but both still result in the same error on Test merge.

Did you try a real merge?

> Just to be clear-- I created the dev branch AFTER I moved the files to the
> new trunk folder, and am attempting to merge the dev branch back to the new
> trunk folder it was created from. This is what's failing.

Did you specify a revision range to merge? If you leave that text box
empty, the merge tries to merge everything that hasn't been merged yet
from revision one to HEAD. But since revision 1 doesn't relate to the
trunk you have now, you could get into trouble.

> Am I better off giving up on the new trunk folder, reverting the delete I
> did on the files in the original folder, then moving THAT folder to the new
> folder tree? Would I then be able to merge the dev branch back, even though
> I branched off the version I moved incorrectly to the new folder?

You could try that, but I would first check my suggestions above.

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