[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: revert and undo revert

From: Benjamin Smith-Mannschott <bsmith.occs_at_gmail.com>
Date: Sun, 31 Aug 2008 00:18:14 +0200

You'll get better help if you more clearly explain what you are trying
to accomplish and why. Guessing what someone is trying to ask is
occasionally amusing. Generally, though, it's too much bother.

On Aug 29, 2008, at 19:58, Jorge Manuel Domingues Peneirol (Via
Directa) wrote:

> Hi.
> I have to give to a client a first version of my software and for
> that I need to revert some revisions. This I already did with the
> “rever to this revison” option in SVN.

Mentioning "revert to this revision" makes it sound like you're using
TortoiseSVN, not the command line client. If so, consider asking at users_at_tortoisesvn.tigris.org

I'm going to assume you're using the command line client from here on

I'm also going to assume you mean to undo changes previously checked
in to the repository, and not that you're trying to undo the results
of an "svn revert" command. "svn revert" throws away *uncommitted*
work you've done locally since your last commit. The "svn revert"
command is -- by definition -- not undoable.

So, you might mean that you used:

$ svn update -r100

To update your local copy to revision 100 (where 100 is the revision
you reverted to.) In this way, you can see what things looked like in
revision 100 of the repository, but this isn't what you want if you
want to make changes to remove all the changes you've made since r100.

You might also have used merge, and indeed, that's the only thing that
makes sense in this case:

$ svn merge -rHEAD:100 . .

Which means: make the changes locally which are necessary to get from
the current (HEAD) state of the repository back to how it was in
revision 100 within the current working copy.

The changes made by merge are purely local. In your working copy. On
your machine. If you want them to be visible for others, you'll have
to commit them.

> But now I need to put this revisions back in SVN.

Yes. merge. then commit.

> Is there any way I can do this in SVN … without doing another commit
> in the developers pc ?

I'm sorry, you've lost me here completely. Do the merge and commit
from your PC. Or are you confusing commit and update?

// Ben
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-31 00:18:38 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.