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

Re: how to release sticky nonHEAD status a la CVS -A

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Fri, 18 Jul 2008 23:54:49 +0100

2008/7/18 Brock, Linda (MS) <Linda.Brock_at_ngc.com>:
> I need to know how to, after retrieving a back-version of a file, to
> release the sticky tag (non-HEAD status) so I can update it to the HEAD. It
> is treating the original version as the head for diffs and updates. To be
> more specific, I deleted (renamed aside) version 1.2 and did an update
> specifying I wanted 1.1, then I made my edits, and now someone has committed
> 1.3, and I want to get it (via update after again renaming-aside my
> edited-1.1) or at least diff against it, but it keeps comparing against 1.1
> not against 1.3.

It's not clear exactly what you and your co-workers have done, but I'm
guessing you used Update-to-revision to get an old version. Do not use
that if you intend to modify the files.

Note the caution box after the description of update-to-revision.

If you want to undo work which has already been committed, the easiest
way is to show the log for the file(s) in question and use the context
menu in the top pane to 'revert changes from this revision' or 'revert
to this revision'.

As for the diffs, I think you misunderstand how subversion works. When
you update your working copy (to HEAD or any other revision)
Subversion keeps a local BASE, or pristine, copy, which is the state
of the file in the repository at the version you updated to. When you
diff the file, it is against that pristine copy so the diff is showing
just your changes.

If you go to the Check for modifications dialog and check repository,
you will see files changed locally and in the repository. Double click
to do a 3-way diff showing what has changed relative to the last
common ancestor.

If you just update your working copy, it will pull down the new 1.3
version and merge into that the changes you made against 1.1.

> I am very familiar with CVS and I know I just need to do a "cvs update
> -A myfile.m" but cannot find out how to do it in TortoiseSVN. We all are
> new to Subversion here, having just used it for 2-3 days. I could just check
> out a new workarea, and copy and paste it over here from there; but there
> should be a more elegant and convenient way. I also know from experience
> with cvs that we will need to do this fairly often.
> I have asked coworkers on other projects, read all the FAQs, read the
> manual sections on updates, and googled for sticky, revert, retrieve, back,
> head, and even "-A", and I think some others, and am amazed that I'm not
> finding anything even close.
> Also -- (and I have dogpiled for this too and not found anything), it
> would be very helpful to put out an "intro to SVN for current users of CVS",
> i.e. a quick guide for converting skills over to SVN. I could write it
> eventually but right now I need to read it!



: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-19 00:54:57 CEST

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