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

Re: Newbie needs help with rolling back to older revision, then commiting that revision

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 17 Jun 2008 22:09:35 +0200

croceldon wrote:
> Stefan,
>
> Please understand that it's not my intent to be rude; I know you guys
> are trying to help and I really appreciate that. However, I'll ask
> that you read the very first line of my very first post again. I am
> so new at svn and Tortoise that I'm having trouble following the help
> you're giving me. Again, not your fault, no intention of being rude
> here. It's just that I'm so new, all the terms are unfamiliar, etc.
> I realize that you're the project owner for TortoiseSVN, and you
> understand this upside down and backwards, but I've only been trying
> SVN for a few weeks.
>
> I do have a question related to one of your bulleted points above:
>
> First bullet: "do not update to that revision!" - How can I avoid
> updating to the latest revision (which I'm trying to revert) if my WC
> is already at that revision? Again, I'm
> sure this is just terminology, but I'm confused.

HEAD is always the latest revision of the repository. If you're working
alone, your working copy will always be at that revision (well, with a
few exceptions).
Every time you run "update", your working copy will get updated to the
HEAD revision (unless you use the "update to revision" dialog and
specify a different revision, but that's something you should do only if
you're absolutely sure what you want to do).

May I suggest that you read the subversion book (at least the first
chapters): http://svnbook.red-bean.com/en/1.4/index.html
You should at least read chapter 1 (fundamental concepts). It explains
the basics of Subversion.

> Last bullet "commit" - It wouldn't let me! When I reverted changes
> from versions 6 & 7, and then tried to commit, it said there were no
> changes to commit! Maybe I'm working through the wrong log here, or
> something? When you say "show the log for your working copy " do you
> mean rclicking the WC > TortoiseSVN, Show Log? Or there another log
> I'm supposed to be looking at.

Yes, right-click on WC, TortoiseSVN->Show Log.

If you first updated your working copy (with the "update" command, not
the "update to revision" command), then your working copy was at HEAD.
If you then to the show-log, you will see all commits you did. If you
want to revert revisions 6 & 7, then you have to select those revisions
(Ctrl-Click) in the top pane of the log dialog, right-click, choose
"revert changes from these revisions".
Then, another dialog will pop up, doing the 'reverse merge'. After that,
your working copy will have modifications. Those modifications are
exactly your changes you want to revert, but of course in reverse (i.e.,
if you added a line in revision 6 & 7, that line will be removed in your
working copy).
Then you can commit those changes again.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-06-17 22:10:02 CEST

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