Return-Path: Delivered-To: apmail-apr-dev-archive@www.apache.org Received: (qmail 5767 invoked from network); 6 Oct 2010 16:21:21 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Oct 2010 16:21:21 -0000 Received: (qmail 40296 invoked by uid 500); 6 Oct 2010 16:21:21 -0000 Delivered-To: apmail-apr-dev-archive@apr.apache.org Received: (qmail 40144 invoked by uid 500); 6 Oct 2010 16:21:20 -0000 Mailing-List: contact dev-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Id: Delivered-To: mailing list dev@apr.apache.org Received: (qmail 40137 invoked by uid 99); 6 Oct 2010 16:21:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Oct 2010 16:21:20 +0000 X-ASF-Spam-Status: No, hits=-5.0 required=10.0 tests=RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of jorton@redhat.com designates 209.132.183.28 as permitted sender) Received: from [209.132.183.28] (HELO mx1.redhat.com) (209.132.183.28) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Oct 2010 16:21:13 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o96GKrdc013361 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 6 Oct 2010 12:20:53 -0400 Received: from turnip.manyfish.co.uk (vpn-8-170.rdu.redhat.com [10.11.8.170]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o96GKoq8027658 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 6 Oct 2010 12:20:52 -0400 Received: from jorton by turnip.manyfish.co.uk with local (Exim 4.72) (envelope-from ) id 1P3WjZ-0007NY-UI for dev@apr.apache.org; Wed, 06 Oct 2010 17:20:49 +0100 Date: Wed, 6 Oct 2010 17:20:49 +0100 From: Joe Orton To: dev@apr.apache.org Subject: Re: apr-util 1.5.x -> trunk Message-ID: <20101006162049.GA28270@redhat.com> Mail-Followup-To: dev@apr.apache.org References: <20101005074049.GA10384@redhat.com> <4CAB6BAF.6080309@rowe-clan.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <4CAB6BAF.6080309@rowe-clan.net> User-Agent: Mutt/1.5.20 (2009-08-17) Organization: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in UK and Wales under Company Registration No. 03798903 Directors: Michael Cunningham (USA), Brendan Lane (Ireland), Matt Parson (USA), Charlie Peters (USA) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 On Tue, Oct 05, 2010 at 01:17:19PM -0500, William Rowe wrote: > On 10/5/2010 2:40 AM, Joe Orton wrote: > > Any objection to renaming the apr-util 1.5.x branch to "trunk"? It is > > the trunk for that tree now. > > Let us know if Nick's suggested change satisfies, I've drafted a trunk > which explains things... I don't really need the status quo "explained" to me in a README file. I proposed to fix it, because it is (to me, obviously) broken. 1) The tip of development for the apr-util tree is what is currently branches/1.5.x. Yes, most of that code also exists in the apr tree. apr-util releases and branches do not come from the apr tree, they come from the apr-util tree. 2) I have hard-coded into my brain the convention that the trunk is the trunk, not a branch named by its current version. I also have scripts which make this assumption. 3) The trunk called branches/1.5.x will have to be renamed to a trunk called branches/1.6.x if 1.5.x gets cut. Which is dumb. 4) Yes, "people" might get confused if they try to use apr-util's trunk with the APR 2.x, but, meh. We are the people who use the VCS and it should be arranged for our convenience. Regards, Joe