From owner-cvs-all Sun Mar 19 23: 5:50 2000 Delivered-To: cvs-all@freebsd.org Received: from lucifer.bart.nl (lucifer.bart.nl [194.158.168.74]) by hub.freebsd.org (Postfix) with ESMTP id DCBAF37B846; Sun, 19 Mar 2000 23:05:43 -0800 (PST) (envelope-from asmodai@lucifer.bart.nl) Received: (from asmodai@localhost) by lucifer.bart.nl (8.9.3/8.9.3) id IAA94563; Mon, 20 Mar 2000 08:05:42 +0100 (CET) (envelope-from asmodai) Date: Mon, 20 Mar 2000 08:05:42 +0100 From: Jeroen Ruigrok van der Werven To: "David O'Brien" Cc: "Patrick S. Gardella" , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/release/picobsd/bridge PICOBSD src/release/picobsd/custom PICOBSD-C src/release/picobsd/dial PICOBSD src/release/picobsd/install PICOBSD src/release/picobsd/isp PICOBSD src/release/picobsd/net PICOBSD src/release/picobsd/router ... Message-ID: <20000320080541.D94434@lucifer.bart.nl> References: <200003191941.LAA58695@freefall.freebsd.org> <20000319152414.B53583@dragon.nuxi.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0.1i In-Reply-To: <20000319152414.B53583@dragon.nuxi.com>; from obrien@FreeBSD.org on Sun, Mar 19, 2000 at 03:24:14PM -0800 Organisation: bART Internet Services B.V. Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG -On [20000320 00:25], David O'Brien (obrien@FreeBSD.org) wrote: >On Sun, Mar 19, 2000 at 11:41:05AM -0800, Patrick S. Gardella wrote: >> MF5C: Remove "conflicts" from kernel config files for picobsd. > >Why "MF5C"?? Do we have some other verison of -CURRENT that I am not >aware of? Given that we now have three branches, I'd started to use a system to keep track what merged from where. In this case MF5C denoted that it was a Merge From 5-CURRENT. Helps me keep my sanity along three branches. -- Jeroen Ruigrok van der Werven Network- and systemadministrator VIA NET.WORKS The Netherlands BSD: Technical excellence at its best http://www.bart.nl Life is just one damned thing after another... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message