[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Shooting yourself in the foot with CVS and branches

From: Kai Großjohann
Subject: Shooting yourself in the foot with CVS and branches
Date: Sun, 15 Jul 2001 21:30:59 +0200
User-agent: Gnus/5.090004 (Oort Gnus v0.04) Emacs/21.0.105

Can anyone help to heal the wounds?  Argh.  Stupid me.

I have a project where the current development version is the head.
I've also got a `stable' branch which is supposed to contain the
released version.  The idea is that people who do `cvs co -rstable'
and then `cvs update' get the stable code whereas people who do `cvs
co' and then `cvs update' get the development code.

So, I created the stable branch and then I made changes on the head.
And I manually moved some of those changes to the stable branch.

But now I've decided that whatever is in the head is good enough and I
just want that stuff to be in the stable branch.

So, in youthful stupidity, I created a new directory, changed to it,
and then I did this:

    cvs -d ... co .
    cvs ci -rstable

And the answer was:

    cvs commit: Up-to-date check failed for `tramp/lisp/ChangeLog'

Repeated for every source file.

Like I said, all I want is that people who have done `cvs co -rstable'
in the past will get the new version when they do `cvs up' tomorrow.

Greg has answered Garvin's question saying that it might be better to
have the head be the stable version and to do the development on the
trunk.  Alas, that might be too late now.  Though maybe with an
announcement I can tell people to do `cvs update -rdevel' if they want
the devel version and `cvs update -A' (?) if they want the stable
stuff.  Hm.  Hmmmm....

Or maybe I just do away with all this branching stuff since it's too
much trouble anyway.  But I'm happy about any suggestions you might

~/.signature: No such file or directory

reply via email to

[Prev in Thread] Current Thread [Next in Thread]