From owner-freebsd-hackers Fri Jun 7 19:04:34 1996 Return-Path: owner-hackers Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id TAA18461 for hackers-outgoing; Fri, 7 Jun 1996 19:04:34 -0700 (PDT) Received: from main.statsci.com (main.statsci.com [198.145.127.110]) by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id TAA18452; Fri, 7 Jun 1996 19:04:25 -0700 (PDT) Received: from statsci.com by main.statsci.com with smtp (Smail3.1.29.1 #3) id m0uSDNn-0005zxC; Fri, 7 Jun 96 19:04 PDT Message-Id: To: Nate Williams cc: "Jordan K. Hubbard" , hackers@FreeBSD.org (FreeBSD Hackers), freebsd-stable@FreeBSD.org (FreeBSD Stable Users), FreeBSD-current@FreeBSD.org (FreeBSD current users) Subject: Re: The -stable problem: my view References: <199606072306.RAA01251@rocky.sri.MT.net> <17605.834196067@time.cdrom.com> <199606080114.TAA01864@rocky.sri.MT.net> In-reply-to: Your message of "Fri, 07 Jun 1996 19:14:08 -0600." <199606080114.TAA01864@rocky.sri.MT.net> Reply-to: scott@statsci.com Date: Fri, 07 Jun 1996 19:04:06 -0700 From: Scott Blachowicz Sender: owner-hackers@FreeBSD.org X-Loop: FreeBSD.org Precedence: bulk Nate Williams wrote: > The complexity of merging two *very* different trees isn't going to > change, and no automatic scheme is going to make it any easier. So, it sounds like goal should be to reduce the differences between the "current" tree and the "stable" tree. One question I did have - when a real release happened, why wouldn't you make -release and -stable the same tree at that instant? Maybe I'm oversimplifying, but at some instant, shouldn't -current, -stable and -release be the same thing? Or maybe the -stable tree is the "main trunk" where -release is snapshot'd off of at release time and -current is a major development branch that gets merged into the -stable tree as it is stablized? Ehhh...now that I think on it...that sounds too simplistic. Or keep a -current tree (or collection of them acting as "token generators" as in Jordan's message) that lags the real -current tree by a week or two and snapshot that into a -stable if enough "it was good" "tokens" are received over the one week period? Why does my mind wander back to college and the Heisenberg principle? :-)) Scott Blachowicz Ph: 206/283-8802x240 Mathsoft (Data Analysis Products Div) 1700 Westlake Ave N #500 scott@statsci.com Seattle, WA USA 98109 Scott.Blachowicz@seaslug.org