On 4/18/06, Graham Leggett <minfrin@sharp.fm> wrote:
> I have a file which has been broken and subsequently committed to my
> repository. I now want to revert to the previous version.
>
> Both Subclipse' "replace with", and svn update -r<revision> allow me to
> revert my file to the revision I specify.
>
> The trouble is, I cannot commit this - because svn complains the file
> isn't up to date, so you run svn update, which in turn reverses the
> "replace with" and you're back to the broken file you started with.
>
> I can at the moment replace the file with the older version, copy that
> file outside the repo, run svn update, and then copy the file back into
> the repo over the file and commit that, but that's very klunky.
>
> What is the "correct" way to do this? I couldn't not find anything obvious
> in the svn book that covered this.
You probably want a reverse merge. svn merge -r BADVERSION:GOODVERSION FILENAME
http://svnbook.red-bean.com/en/1.0/ch04s04.html - Scroll down to
"Undoing changes"
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Apr 18 14:08:18 2006