On Thu, Oct 18, 2007 at 04:54:46PM +0100, Andrew Doran wrote:

> On Thu, Oct 18, 2007 at 05:23:59PM +0900, YAMAMOTO Takashi wrote:
> 
> > > Log Message:
> > > Merge the ppcoea-renovation branch to HEAD.
> > 
> > i'd recommend to use -kk and not to commit rcsid-only changes.
> 
> If you are following the instructions from the developer's pages on "working
> with CVS branches", I find this works better than using cvs update -j:
> 
> cvs rdiff -u -kk -r foo-base -r foo-nbase path/to/branch > update.diff

... just to note, the rdiff -kk is not sticky.

Andrew