From owner-cvs-share  Sun Mar 16 01:06:27 1997
Return-Path: <owner-cvs-share>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id BAA16895
          for cvs-share-outgoing; Sun, 16 Mar 1997 01:06:27 -0800 (PST)
Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19])
          by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id BAA16884;
          Sun, 16 Mar 1997 01:06:15 -0800 (PST)
Received: (from bde@localhost) by godzilla.zeta.org.au (8.8.3/8.6.9) id UAA32459; Sun, 16 Mar 1997 20:03:12 +1100
Date: Sun, 16 Mar 1997 20:03:12 +1100
From: Bruce Evans <bde@zeta.org.au>
Message-Id: <199703160903.UAA32459@godzilla.zeta.org.au>
To: bde@zeta.org.au, jkh@time.cdrom.com
Subject: Re: cvs commit: src/share/doc/handbook ...
Cc: cvs-all@freefall.freebsd.org, CVS-committers@freefall.freebsd.org,
        cvs-share@freefall.freebsd.org, jkh@freefall.freebsd.org
Sender: owner-cvs-share@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

>> Why did you merge all of these files?  About half of them only changed
>> in -current because someone changed their $Id$ to $FreeBSD$ and back
>> again.  Merging $Id$ changes into a branch doesn't do anything good.
>
>Because I was in a hurry and didn't have time for finesse' with
>/usr/share/doc; I just needed to make sure everything was merged and
>it was safer to do it in a batch.

`cvs -j' seems to be more braindamaged than I thought.  The following
seems to be necessary to stop it merging null Id differences for module
`papers':

	cvs -q co     -kk -r RELENG_2_2         papers
	cvs -q update                   -j HEAD papers

I would have expected:

	cvs -q update -kk -j RELENG_2_2 -j HEAD papers

to not merge the null differences.

	cvs -q rdiff  -kk -r RELENG_2_2 -r HEAD papers | patch -p3

works right.

Bruce