Date: Thu, 17 Aug 1995 13:15:24 +0800 (WST) From: Peter Wemm <peter@haywire.dialix.com> To: CVS-commiters@freefall.FreeBSD.org, cvs-usrsbin@freefall.FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/sendmail - Imported sources Message-ID: <Pine.SV4.3.91.950817130838.3060M-100000@haywire.DIALix.COM> In-Reply-To: <199508170440.VAA17616@freefall.FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 16 Aug 1995, Peter Wemm wrote: > Date: Wed, 16 Aug 1995 21:40:04 -0700 > From: Peter Wemm <peter@freefall.FreeBSD.org> > To: CVS-commiters@freefall.FreeBSD.org, cvs-usrsbin@freefall.FreeBSD.org > Subject: cvs commit: src/usr.sbin/sendmail - Imported sources > > peter 95/08/16 21:40:03 > > Branch: usr.sbin/sendmail 1.1.1 > Log: > Import Sendmail v8.6.12, onto the CSRG(!) branch. > A seperate commit to fix the conflicts wil follow. > > Status: > > Vendor Tag: CSRG > Release Tags: v8_6_12 > > C src/usr.sbin/sendmail/src/conf.c > C src/usr.sbin/sendmail/src/daemon.c > C src/usr.sbin/sendmail/src/deliver.c > C src/usr.sbin/sendmail/src/readcf.c > > 4 conflicts created by this import. > Use the following command to help the merge: > > cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin/sendmail FYI: Rod and I agonized over what to do about these.. We tried all sorts of neat tricks, including directly editing the RCS files, but we were unable to get what we needed. In the end, we decided "screw it!" - and just go with the flow and patch it up this time (and again should 8.6.13 come out before 8.7 (which is due RSN)). We *will* fix this properly for 8.7 - but that will probably be by re-importing it afresh, into a different area, with some cute Makefiles, or some other mechanism yet to be thought of. -Peter
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.SV4.3.91.950817130838.3060M-100000>