Re: question: revert to this revision behavior

On Wednesday 28 March 2007 20:22, Jon Daley wrote:
> I am running 1.4.3 rev 8645, so that is later than all the bug reports
> and questions I have seen.
>
> >From the tsvn log dialog, I see the "revert to this revision" option.
>
> Can someone explain what "svn" command it is running?

It basically does a reverse "svn merge" between the selected revision and
HEAD and merges this into your working copy.

> I assumed it was running "svn cat -rXXX file.name > file.name" which
> would actually revert the file to that revision.

"svn cat" would be different for two reasons:
* your local modifications would be overwritten
* you could not commit the result because it would be "out of date"

> Instead it appears to be running "svn merge HEAD:XXX file.name" or
> something similar.

exactly.

> "revert" doesn't seem like the right term to me, since if there are local
> changes, it doesn't revert them, but does some sort of merge.

It *reverts* the changes of the selected revisions by reverting these
changes in the working copy.

> It doesn't really replace it if it is doing a merge, right?

Correct, "replace" is only the right term if there are no local
modifications. Do you have a suggestion how the paragraph could be changed
to make it clearer?

Tobias

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