Re: newbie question about branch and sticky'ness?

[Russ Sherk]

On 3/21/06, Martin Jørgensen <address@hidden> wrote:

Hi,

I'm a cvs newbie. I know I should rather learn cvs from the commandline
but since tortoisecvs is so easy, I created a branch from it (since I
had a program I wanted to change something from)...

Somewhere I read that when I work on either the branch or the "HEAD"
this would make a "sticky" flag - I've seen this "sticky" flag several
places... But never understood what it meant. What does it mean?

>From the (a?) manual: http://www.network-theory.co.uk/docs/cvsmanual/cvs_53.html

Basically, if you check out a non-branch revision of a file using the '-r <tag|revision>' option to co, the tag or revision is considered a sticky tag.  You can not commit changes to a sticky tag. 

Now, I don't need this branch anymore... I think that I actually never
committed anything to the branch... Do I have to "close" the branch or
parse it into the trunk - I suppose that is the one called "HEAD"?

You don't have to do anything to it.  Just ignore it.  You can delete it (not sure how with tortisecvs...) but leaving it won't harm anything.

If you had made changes and wanted the changes on the main trunk (HEAD), you would want to merge the branch to the main trunk.  Check the manual for a discussion on how to do this (http://ximbiot.com/cvs/manual/cvs-1.11.21/cvs_5.html#SEC54)

As you can hear, I'm a newbie and even though I tried to read something
about it on the internet, I'm still confused... TIA.

The best place to look for info on CVS is the CVS manual (http://ximbiot.com/cvs/manual/) and FAQ (http://ximbiot.com/cvs/wiki/index.php?title=CVS_FAQ) and this group.

Have fun!

--Russ

Best regards / Med venlig hilsen
Martin Jørgensen

--
---------------------------------------------------------------------------
Home of Martin Jørgensen - http://www.martinjoergensen.dk
_______________________________________________
info-cvs mailing list
address@hidden
http://lists.nongnu.org/mailman/listinfo/info-cvs