On Dec 14, 11:08am, yamt@mwd.biglobe.ne.jp (YAMAMOTO Takashi) wrote:
-- Subject: Re: CVS commit: src/sys

| > | i'd recommend to use -kk when working on branches. :-)
| > 
| > That does not work either... because then the id's don't get expanded...
| > 
| > christos
| 
| i don't understand what you mean.  can you explain what's a problem?
| 
| i'm using -kk whenever doing "cvs up" or "cvs diff" for branches.
| (unless i forgot to add the option.)
| i haven't noticed any problems yet.

How do you merge with head?

christos