Hi Robert,
I'm not sure if I fully understand Daniel's suggestion, maybe its only a
short cut to the merge procedure I describe below.
Am 18.08.2010 08:40, schrieb Daniel Becroft:
>
> If you can see an entry in the Log for the deletion of /trunk, then you have
> committed the delete.
>
> To restore /trunk:
> 1) Open the repository browser to the last good revision (r73) in your case.
> 2) Right-click on /trunk in the tree-view, and select "Copy to ...".
> 3) In the New name field, change the name (and then back again) to enable
> the OK button.
> 4) Click OK. Enter a log message, and Click OK.
>
> /trunk will now be available in HEAD, with history.
>
> Cheers,
> Daniel B.
From my point of view you have to merge
all changes between r73 and r75 in reverse order.
* right-click the mouse on the root folder of your working copy
* select "TortoiseSVN > Merge..." and the Merge dialog opens
* check [*] Merge range of revisions, [Next >]
* Edit "URL to merge from" should contain trunk
(change or select by browsing)
* "Revision range to merge" enter here 74-75 (yes! r74 and r75)
or select the last two changes by browsing, click [Show log]
* check [*] Reverse merge, [Next >]
* (do a [Test merge] if you want)
* [Merge]
Now you have a working identically to the r73 revision ready for commit.
Do the commit entering a good log message and you're done. (now at r76)
Best Regards,
Wolf
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2648132
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-08-18 09:34:25 CEST