From owner-cvs-bin Mon Feb 17 04:31:24 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id EAA12703 for cvs-bin-outgoing; Mon, 17 Feb 1997 04:31:24 -0800 (PST) Received: from spinner.DIALix.COM (spinner.DIALix.COM [192.203.228.67]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id EAA12648; Mon, 17 Feb 1997 04:29:42 -0800 (PST) Received: from spinner.DIALix.COM (localhost.DIALix.oz.au [127.0.0.1]) by spinner.DIALix.COM (8.8.4/8.8.4) with ESMTP id UAA02153; Mon, 17 Feb 1997 20:29:06 +0800 (WST) Message-Id: <199702171229.UAA02153@spinner.DIALix.COM> X-Mailer: exmh version 2.0gamma 1/27/96 To: Bruce Evans cc: dg@root.com, jkh@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org, CVS-committers@freefall.freebsd.org Subject: Re: cvs commit: src/bin/df - Imported sources In-reply-to: Your message of "Mon, 17 Feb 1997 23:04:39 +1100." <199702171204.XAA28788@godzilla.zeta.org.au> Date: Mon, 17 Feb 1997 20:29:04 +0800 From: Peter Wemm Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Bruce Evans wrote: > >>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. Because the vendor branch wasn't changed the second time, it was a null import. The 1.1.1 was not changed. > Bruce Cheers, -Peter