From owner-freebsd-stable Fri Nov 26 12:28:28 1999 Delivered-To: freebsd-stable@freebsd.org Received: from workhorse.iMach.com (workhorse.iMach.com [206.127.77.89]) by hub.freebsd.org (Postfix) with ESMTP id D63D01556B for ; Fri, 26 Nov 1999 12:28:14 -0800 (PST) (envelope-from forrestc@workhorse.iMach.com) Received: from localhost (forrestc@localhost) by workhorse.iMach.com (8.8.8/8.8.8) with SMTP id NAA29122; Fri, 26 Nov 1999 13:19:03 -0700 (MST) Date: Fri, 26 Nov 1999 13:19:01 -0700 (MST) From: "Forrest W. Christian" To: "Jordan K. Hubbard" Cc: Colin , stable@FreeBSD.ORG Subject: Re: Bug-fixing previous -RELEASE, was Re: speaking of 3.4... In-Reply-To: <13998.943644592@zippy.cdrom.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG (Leaving Jordan's original message for context) I think I just "got it". Is the following description correct: (Ignoring -CURRENT for a minute). You have stable tracking along with "snapshots" like: -STABLE-19991001 -STABLE-19991002 -STABLE-19991005 and so on. (Exact naming convention might be sligtly different) My original assumption was that this occured: -STABLE-19991201 - Feature Freeze -STABLE-19991206 - Bug fixes incorporated -STABLE-19991212 - Final bug fixes incorporated -STABLE-19991215 - release - EXACTLY the same as -RELEASE, no new branch -STABLE-19991216 - Back to "stable normallity" I believe what I am hearing is that in reality what occurs is this: -STABLE-19991212 - Final bug fixes incorporated -STABLE-19991215 - release, NEW BRANCH CREATED. And then we have both: -STABLE-19991216 - next stable "snapshot" ...and so on -RELEASE-19991220 - release bugfixes ...and so on. So in all reality, I could track -RELEASE on a machine instead of -STABLE to get bug fixes. Of course, I would also have to help encorage someone to merge "critical" bug-fixes back into the appropriate -RELEASE. Is this correct? If not, where did I err? -forrestc@imach.com On Fri, 26 Nov 1999, Jordan K. Hubbard wrote: > > Ok, so, let's assume I JUST want to incorporate bugfixes into the -RELEASE > > (be it 3.x or whatever) that I have on a particular machine. How would I > > go about doing this? > > If it's a new bug fix, file a PR. If it's a merge case, plead to > committers for a merge to your branch of choice. With 185 > committers or whatever our number is this week, it's generally not > hard to find a sympathetic ear for specific requests. > > - Jordan > - Forrest W. Christian (forrestc@imach.com) KD7EHZ ---------------------------------------------------------------------- iMach, Ltd., P.O. Box 5749, Helena, MT 59604 http://www.imach.com Solutions for your high-tech problems. (406)-442-6648 ---------------------------------------------------------------------- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message