From owner-cvs-all Mon Mar 20 0:23:46 2000 Delivered-To: cvs-all@freebsd.org Received: from relay.nuxi.com (nuxi.cs.ucdavis.edu [169.237.7.38]) by hub.freebsd.org (Postfix) with ESMTP id 8BFA237B6AA; Mon, 20 Mar 2000 00:23:42 -0800 (PST) (envelope-from obrien@NUXI.ucdavis.edu) Received: from dragon.nuxi.com (root@d60-024.leach.ucdavis.edu [169.237.60.24]) by relay.nuxi.com (8.9.3/8.9.3) with ESMTP id AAA53002; Mon, 20 Mar 2000 00:23:41 -0800 (PST) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.9.3/8.9.1) id AAA63123; Mon, 20 Mar 2000 00:23:38 -0800 (PST) (envelope-from obrien) Date: Mon, 20 Mar 2000 00:23:38 -0800 From: "David O'Brien" To: Jeroen Ruigrok van der Werven Cc: 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: <20000320002338.A63074@dragon.nuxi.com> Reply-To: obrien@NUXI.ucdavis.edu References: <200003191941.LAA58695@freefall.freebsd.org> <20000319152414.B53583@dragon.nuxi.com> <20000320080541.D94434@lucifer.bart.nl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0.1i In-Reply-To: <20000320080541.D94434@lucifer.bart.nl>; from asmodai@bart.nl on Mon, Mar 20, 2000 at 08:05:42AM +0100 X-Operating-System: FreeBSD 4.0-CURRENT Organization: The NUXI BSD group X-PGP-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Keyid: 34F9F9D5 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Mon, Mar 20, 2000 at 08:05:42AM +0100, Jeroen Ruigrok van der Werven wrote: > Given that we now have three branches, I'd started to use a system to > keep track what merged from where. Merges go from CURRENT to STABLE. Committing something to the RELENG_3 branch does not require it to thru the RELENG_4 branch first. > In this case MF5C denoted that it was a Merge From 5-CURRENT. Then that is MFC. > Helps me keep my sanity along three branches. But confuses others and breaks greping for already done MFC's. -- -- David (obrien@NUXI.com) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message