Re: Shooting yourself in the foot with CVS and branches

[Hannu Koivisto]

address@hidden (Kai Großjohann) writes:

| 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.
...
|     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.

Perhaps ``for i in files; do cvs update -p -r HEAD "$i" >! "$i"; done''?
(Using zsh's syntax.)

-- 
Hannu
Please don't send copies of list mail