Re: CVS: versioning and branching

On Thu, 31 Mar 2005, Steven Armstrong wrote:
>
> Update:
> It seems that the -r flag is sticky.
> So once you checked out/updated using it you don't need to specify it
> for following actions (e.g. commit).
>
> Please note that I'm only just learning to use all this stuff. So you
> should know better than to blindly follow what I write here ;-)

I have a fix I want to apply to the 1.2 code.  I tried:

    cvs update -r "release-1_2" -dP

which worked fine and (theoretically) downgraded me to the 1.2 code.  I 
applied the change to the code, tested it and it's fine.

So now when I do:

    cvs commit -r "release-1_2" fileentry.py

or:

    cvs commit fileentry.py

I get:

cvs commit: sticky tag `release-1_2' for file `fileentry.py' is not a 
branch
cvs [commit aborted]: correct above errors first!


So what's going on?

Can someone spend some time finishing what we started in terms of writing 
up the process for how we're using CVS now?  Until then (or until I figure 
out how to do what I need to get done), I can't do anything in regards to 
PyBlosxom 1.1 and 1.2 both of which have minor cosmetic issues still. 
Not to mention the contributed plugins pack which has a _lot_ of issues 
still for both the pack for 1.1 and the pack for 1.2.

/will


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click