[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Shooting yourself in the foot with CVS and branches
From: |
Kai Großjohann |
Subject: |
Re: Shooting yourself in the foot with CVS and branches |
Date: |
Mon, 16 Jul 2001 12:03:47 +0200 |
User-agent: |
Gnus/5.090004 (Oort Gnus v0.04) Emacs/21.0.105 |
On Sun, 15 Jul 2001, Kai Großjohann wrote:
> 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.
I now used PCL-CVS in Emacs to do it for me. I went to the working
directory for the stable branch, and then I ran
cvs update -jHEAD
and then I did conflict resolution on all the files which had a
conflict, and always chose the version from the repository.
I wonder whether there would have been a less manual method to do it.
kai
--
~/.signature: No such file or directory