Subject: Re: CVS commit: src/sys
To: None <firstname.lastname@example.org>
From: YAMAMOTO Takashi <email@example.com>
Date: 12/14/2005 22:24:48
> | > | 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?
create a diff with "cvs di -kk" and apply it.
it's the reason why i forget to add uvm_readahead.c. :-(
as "cvs up -kk -j -j" worked when syncing with head, i think it also works
to merge a branch to head. but i'm not sure.