Date: Mon, 17 Feb 1997 21:20:37 +0800 From: Peter Wemm <peter@spinner.DIALix.COM> 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 Message-ID: <199702171320.VAA02443@spinner.DIALix.COM> In-Reply-To: Your message of "Mon, 17 Feb 1997 23:49:32 %2B1100." <199702171249.XAA29938@godzilla.zeta.org.au>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199702171320.VAA02443>