Date: Mon, 17 Feb 1997 23:04:39 +1100 From: Bruce Evans <bde@zeta.org.au> To: dg@root.com, jkh@freefall.freebsd.org Cc: cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org, CVS-committers@freefall.freebsd.org Subject: Re: cvs commit: src/bin/df - Imported sources Message-ID: <199702171204.XAA28788@godzilla.zeta.org.au>
next in thread | raw e-mail | index | archive | help
>>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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199702171204.XAA28788>