[Zope3-dev] Re: Reverting a committed change under SVN

[Philipp von Weitershausen]

Tim Peters wrote:
> For the first time today (under Subversion), I wanted to roll back a file to
> undo the last checkin made to it.  I used
> 
>     svn update -r<old_revision>

This will update your working copy (or that particular file in it) to a 
specific revision. It is indeed the intended behaviour that it will not 
be marked as modified.

> I expect I must be missing something obvious here!
> 
> Hmm.
> 
>     svn merge -rHEAD:<old_revision> THEFILE
> 
> works too, and I bet that's the intended way.

It indeed is the intended way. CVS users should get the all-in-one 'cvs 
update' out of their systems :). In CVS, 'cvs update' is used for
a) checking what's modified
b) merging
c) updating

In subversion, that's three different commands:

a) svn stat
b) svn merge
c) svn up

Philipp