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

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

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Mon, 21 Jul 2008 22:03:18 +0100

2008/7/21 Brock, Linda (MS) <Linda.Brock_at_ngc.com>:
> Simon, Thanks for your response, but I still have unanswered questions:
>
>>> 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.
>>> 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.
>>I'm guessing you used Update-to-revision to get an old version. Do not
> use
>>that if you intend to modify the files.
> Yes that's exactly what I did. And I definitely do intend to modify the
> files. This is a volatile R&D project and we will do a lot of
> try-it-out, mix and match, editing. I have periodically used CVS very
> successfully to help with exactly this kind of work. I used -r1.1 and
> then -A to restick to Head. So, is there another way I should have
> updated to the former 1.1 version, given that I want to modify the file
> and eventually recommit the result?

If you want to undo the changes made between 1.1 and 1.2 so you can
start again from the 1.1 state, the easiest option is to 'show log'
for the directory, right click on the revision you want to go back to
and select 'revert to this revision'. That will effectively
reverse-merge all the later changes and take your working copy back to
1.1

To be honest this volatile environment sounds like a nightmare where
you all end up undoing each others work. You might want to think about
using branches for the different sub-teams to develop features without
impinging on anyone else. Again, read the excellent subversion book on
this subject.

>>Note the caution box after the description of update-to-revision.
> I will try out the SaveRevisionTo; it may do what we need in many cases.
> But I would still like to know how to do the above if possible.

Yes, you could also save a previous version over the top of your
current files. However, unlike CVS subversion versions directories, so
it knows about file additions and renames. If you simply overwrite
with an older version of the directory you may miss the fact that a
redundant file has been deleted, or renamed or whatever. That is why
the reverse merge is safer.

>>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.
> Yikes I had forgotten that; that bites me every time I get back into
> this kind of version control work. Thanks.
>
>>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.
> That was exactly what I wanted it to do, but it didn't seem to use 1.3
> for what it was updating to.

Try show log on your working copy. That will show you all changes
committed to the repository, not just the ones prior to your last
update. If you don't see the 1.3 changes then either you or your
colleague is looking in the wrong place.

You can also use the repo browser to get a repository-wide view. Show
log from the top level of the repository to see all commits in all
directories/branches. If it's still not there, are you even working on
the same repository?

>>> 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.
> And that's what I finally did Friday afternoon, successfully, but I
> still want to know how to do it properly.
>
>>> 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.
> Thanks for the Appendix B reference! It will be very helpful.

Simon

-- 
: ___
: 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-21 23:03:26 CEST

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