From owner-cvs-bin Mon Feb 17 04:13:51 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id EAA11542 for cvs-bin-outgoing; Mon, 17 Feb 1997 04:13:51 -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 EAA11402; Mon, 17 Feb 1997 04:12:04 -0800 (PST) Received: (from bde@localhost) by godzilla.zeta.org.au (8.8.3/8.6.9) id XAA28788; Mon, 17 Feb 1997 23:04:39 +1100 Date: Mon, 17 Feb 1997 23:04:39 +1100 From: Bruce Evans Message-Id: <199702171204.XAA28788@godzilla.zeta.org.au> To: dg@root.com, jkh@freefall.freebsd.org Subject: Re: cvs commit: src/bin/df - Imported sources Cc: cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org, CVS-committers@freefall.freebsd.org Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >>jkh 97/02/17 03:32:06 >> >> src/bin/df - Imported sources >> Update of /home/ncvs/src/bin/df >> In directory freefall.freebsd.org:/c/jkh/df >> >> Revision/Branch: 1.1.1 >> >> Log Message: >> Import the 4.4L2 df on a vendor branch, as suggested by Bruce. >> Obtained from: 4.4Lite2 >> >> Status: >> >> Vendor Tag: CSRG >> Release Tags: bsd_44_lite_2 >> >> U src/bin/df/df.1 >> U src/bin/df/df.c >> U src/bin/df/Makefile > > Didn't Bruce just do this? I won by 130 seconds :-). Why did I get conflicts, and where did jhk's commit go? It makes some sense for the update to be null, but not for commit mail to be sent when the repository isn't changed. Steve already merged everything except the vfs changes. I won't merge any more until other parts of Lite2 are merged (df will become dependent on ../../sbin/mount). Bruce