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

Stefan-

I'm still having issues.

< The from/to date selectors are only for filtering what's already loaded.
< If you want to use dates to fetch the log, use the "show all" button
< (press on the arrow, then choose "revision range" from the menu and
< enter the dates in the svn format).

OK.

< 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.

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.

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?

Thanks,

-Andrew

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-02-01 20:21:48 CET