Received: (from majordom@localhost) by hyperreal.com (8.8.5/8.8.5) id KAA22018; Mon, 9 Jun 1997 10:54:14 -0700 (PDT) Received: from eastwood.aldigital.algroup.co.uk (eastwood.aldigital.algroup.co.uk [194.128.162.193]) by hyperreal.com (8.8.5/8.8.5) with SMTP id KAA21992 for ; Mon, 9 Jun 1997 10:54:03 -0700 (PDT) Received: from gonzo.ben.algroup.co.uk (gonzo.ben.algroup.co.uk [193.133.15.1]) by eastwood.aldigital.algroup.co.uk (8.6.12/8.6.12) with SMTP id RAA06910 for ; Mon, 9 Jun 1997 17:53:45 GMT Subject: Re: branched tree To: new-httpd@apache.org Date: Mon, 9 Jun 1997 18:41:30 +0100 (BST) From: Ben Laurie In-Reply-To: from "Marc Slemko" at Jun 9, 97 11:07:25 am X-Mailer: ELM [version 2.4 PL24 PGP2] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID: <9706091841.aa06400@gonzo.ben.algroup.co.uk> Sender: new-httpd-owner@apache.org Precedence: bulk Reply-To: new-httpd@apache.org Marc Slemko wrote: > > If we are planning a 1.3 release, I am 100% against anything except > critical bugfixes going into 1.2 because it simply leads to too many > trees. Agreed. > > If NT is going to be either in 1.2 after seperate betas or a seperate > 1.2-NT, 1.2 should get any bugfixes that are easy to bring back. Please - let's just call 1.2+NT 1.3. As Randy says, 1.2-NT isn't a version number. > > Note that pcs's commits seem to have something messed up... either it is > his setup locally or a branch thing. Hmm, I get the same thing. Will > have to take a look when I get a chance... Nah - this happens every time we branch. The script that does the diff doesn't get and , it just gets . For the first patch in a branch, subtracting one from the final digit doesn't do the job! Cheers, Ben. -- Ben Laurie Phone: +44 (181) 994 6435 Email: ben@algroup.co.uk Freelance Consultant and Fax: +44 (181) 994 6472 Technical Director URL: http://www.algroup.co.uk/Apache-SSL A.L. Digital Ltd, Apache Group member (http://www.apache.org) London, England. Apache-SSL author