From owner-cvs-bin  Mon Feb 17 05:22:36 1997
Return-Path: <owner-cvs-bin>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id FAA14584
          for cvs-bin-outgoing; Mon, 17 Feb 1997 05:22:36 -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 FAA14501;
          Mon, 17 Feb 1997 05:20:55 -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 VAA02443;
          Mon, 17 Feb 1997 21:20:39 +0800 (WST)
Message-Id: <199702171320.VAA02443@spinner.DIALix.COM>
X-Mailer: exmh version 2.0gamma 1/27/96
To: Bruce Evans <bde@zeta.org.au>
cc: cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org,
        CVS-committers@freefall.freebsd.org, dg@root.com,
        jkh@freefall.freebsd.org
Subject: Re: cvs commit: src/bin/df - Imported sources 
In-reply-to: Your message of "Mon, 17 Feb 1997 23:49:32 +1100."
             <199702171249.XAA29938@godzilla.zeta.org.au> 
Date: Mon, 17 Feb 1997 21:20:37 +0800
From: Peter Wemm <peter@spinner.DIALix.COM>
Sender: owner-cvs-bin@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

Bruce Evans wrote:
> >> 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?

You mean the check for 3rd party commits?   Yeah, that only has meaning 
for 'cvs commit' since 'cvs import' runs from a foreign tree that has not 
been checked out... There's no local version numbers or known timestamps 
(see CVS/Entries*) to compare.  Anyway, the import was harmless, as near 
as I can tell, the files were not changed (no rcs log since there was no 
new 1.1.1.x version created).  The only side effect was that an import 
message was mailed.

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

I suspect there is going to be quite a bit of cascading..

> Bruce

Cheers,
-Peter