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

Unfortunatley it means dealing with added/removed files by hand, but it
eliminates a lot of rubbish from the diff. With all the chaff gone it's
much easier to to read through the diffs by hand and remove cosmetic / 
bogus changes.

Thanks,
Andrew