Re: [TSVN] TortoiseSVN - FAQ

Alf Lacis wrote:
> We want to roll back some work. I cannot see a FAQ which describes
> the best way of doing this. I\'ve been through the R.H.Mouse
> \'Help\', and I\'ve had a look on this website.
>
> For example, we have a \'good\' revision on the trunk at 170. We made
> some changes to the project & got up to 172. We\'ve now decided that
> 171 & 172 are rubbish, and we want everyone to re-start back from 170.
>
> We did an SVN Checkout, setting revision to 170. What do we do next?
> If we do a Checkin, will our stuff be overwritten with 171 & 172? We
> don\'t care if the revision goes numerically to 173: we just don\'t
> want the stuff from 171 & 172.

There are 2 ways to do this in TSVN. You can reverse changes most easily
by doing it one revision at time, if there are only a few revisions to
do:

Show the revision log for the top level folder
Right click on the highest revision (172)
Select 'Revert changes from this revision'
Repeat for the previous revision (171)
Commit your changes.
r173 should now be the same as r170

Of course if there were lots of revisions to change, that would be very
tedious. The other approach is to use merging, which is what the
previous method does behind the scenes.

Start the merge dialog from your top level WC folder.
In the 'from revision' enter the URL corresponding to that folder (which
I think is the default)
Enter the last bad revision (172)
In the 'to revision', check the 'Use "From:" URL' box
Enter the last good revision (170)
Click on merge
Commit your changes

Merging is a bit tricky to understand, but there is a good description
in the online version of the SVN book.

HTH,

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org