From owner-cvs-bin  Mon Feb 17 04:55:00 1997
Return-Path: <owner-cvs-bin>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id EAA13402
          for cvs-bin-outgoing; Mon, 17 Feb 1997 04:55:00 -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 EAA13367;
          Mon, 17 Feb 1997 04:53:15 -0800 (PST)
Received: (from bde@localhost) by godzilla.zeta.org.au (8.8.3/8.6.9) id XAA29938; Mon, 17 Feb 1997 23:49:32 +1100
Date: Mon, 17 Feb 1997 23:49:32 +1100
From: Bruce Evans <bde@zeta.org.au>
Message-Id: <199702171249.XAA29938@godzilla.zeta.org.au>
To: bde@zeta.org.au, peter@spinner.DIALix.COM
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, dg@root.com,
        jkh@freefall.freebsd.org
Sender: owner-cvs-bin@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

>> 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.

And the pre-commit check is only done for commits?

I merged the sources carefully (see ~bde/src/df) but won't commit the
changes until later.

Bruce