Return-Path: X-Original-To: apmail-httpd-dev-archive@www.apache.org Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5796091B0 for ; Wed, 7 Mar 2012 11:48:46 +0000 (UTC) Received: (qmail 11897 invoked by uid 500); 7 Mar 2012 11:48:45 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 11765 invoked by uid 500); 7 Mar 2012 11:48:44 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 11750 invoked by uid 99); 7 Mar 2012 11:48:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Mar 2012 11:48:44 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of i.galic@brainsware.org designates 188.40.115.121 as permitted sender) Received: from [188.40.115.121] (HELO mail.brainsware.org) (188.40.115.121) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Mar 2012 11:48:37 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.brainsware.org (Postfix) with ESMTP id 203E51DE8AC for ; Wed, 7 Mar 2012 11:48:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at brainsware.org Received: from mail.brainsware.org ([127.0.0.1]) by localhost (mail.brainsware.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VlzswkjKXzF6 for ; Wed, 7 Mar 2012 11:48:12 +0000 (UTC) Received: from mail.brainsware.org (mail.brainsware.org [188.40.115.121]) by mail.brainsware.org (Postfix) with ESMTP id 1A6251DE730 for ; Wed, 7 Mar 2012 11:48:12 +0000 (UTC) Date: Wed, 07 Mar 2012 11:48:12 -0000 (UTC) From: Igor =?utf-8?Q?Gali=C4=87?= To: dev@httpd.apache.org Subject: Re: SVN question (Was: Re: log-message-tags) Message-ID: In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Originating-IP: [193.43.158.225] X-Mailer: Zimbra 7.0.0_GA_3077 (ZimbraWebClient - SAF3 (Win)/7.0.0_GA_3077) X-Virus-Checked: Checked by ClamAV on apache.org ----- Original Message ----- > svn:externals is only a client-side mechanism. This will not bring > log-message-tags/ into the branch, and especially not within the tag. > > In essence, you will not be able to recreate any specific state in > time (or a release!) because of this. The repository doesn't actually > reflect the state that you're trying to capture. > > You could construct a tarball for 2.4.x, but a week later, that > tarball cannot be reconstructed. The checksums will not match. etc. Huh? svn externals can reference a specific revision. > My suggestion would be to add a step to the T&R instructions to do a > merge from trunk over to the branch before processing a release. > Thus, > the branch will get a snapshot of the log-message-tags at the time of > release. > > Cheers, > -g > > On Wed, Mar 7, 2012 at 06:33, Jim Jagielski wrote: > > Never mind, I hope I did it correctly :) > > > > =C2=A0 % cat la > > =C2=A0 log-message-tags > > =C2=A0 https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/log-mess= age-tags > > =C2=A0 % pwd > > =C2=A0 blahblah.../dev/httpd-2.4/docs > > =C2=A0 % svn propset svn:externals . -F la > > =C2=A0 property 'svn:externals' set on '.' > > =C2=A0 % svn up > > =C2=A0 Fetching external item into 'log-message-tags': > > =C2=A0 A =C2=A0 =C2=A0log-message-tags/update-log-msg-tags > > =C2=A0 A =C2=A0 =C2=A0log-message-tags/find-messages.cocci > > =C2=A0 A =C2=A0 =C2=A0log-message-tags/next-number > > =C2=A0 A =C2=A0 =C2=A0log-message-tags/macros.h > > =C2=A0 A =C2=A0 =C2=A0log-message-tags/README > > =C2=A0 Updated external to revision 1297944. > > > > > > On Mar 7, 2012, at 6:27 AM, Jim Jagielski wrote: > > > >> A question for SVN experts: can we create an export or something > >> like > >> that that puts the trunk version of docs/log-message-tags/ in > >> the 2.4 branch, so that there exists only 1 canonical version > >> and it lives in trunk but is "referred" to in the 2.4 branch? > >> On Mar 6, 2012, at 7:43 PM, Rainer Jung wrote: > >> > >>> hi Jim, > >>> > >>> On 07.03.2012 00:24, Jim Jagielski wrote: > >>>> Oh yeah... and how do we worry about keeping things in sync. For > >>>> example, right now trunk uses 02298 and 02299, but 2.4 does not. > >>>> When another log entry is added to 2.4, do we use these or skip > >>>> these??? > >>>> > >>>> On Mar 6, 2012, at 6:21 PM, Jim Jagielski wrote: > >>>> > >>>>> Hmmm... anyone else noticing that the httpd-2.4 branch is > >>>>> lacking > >>>>> the docs/log-message-tags/ dir? > >>> > >>> I asked the question in the "Questions" thread end of January: > >>> > >>>>> 2) log tags > >>>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > >>>>> > >>>>> r1209743 | sf | 2011-12-02 23:26:54 +0100 (Fri, 02 Dec 2011) | > >>>>> 3 > >>>>> lines Add APLOGNO() macro for unique tags for every log > >>>>> message. > >>>>> Add some scripts to make adding these tags easier. > >>>>> > >>>>> This has only been backported partially. The directory > >>>>> docs/log-message-tags is mising in 2.4.x as well as the > >>>>> update-log-tags and update-log-msg-tags targets in Makefile. > >>> > >>> Stefan answered on Jan. 31st: > >>> > >>>> This is intentional and not for backport. The log tags should be > >>>> consistent between trunk and the branches, so there can be only > >>>> one > >>>> "docs/log-message-tags/next-number" file, and that resides in > >>>> trunk. > >>>> That means if an error message is introduced in 2.4 but not in > >>>> trunk, > >>>> the next-number file in trunk should be updated. > >>>> > >>>> But there should probably be a docs/log-message-tags/README file > >>>> in > >>>> 2.4 that explains this. I will write something when I have time. > >>>> But > >>>> as a non-code change, this is not that urgent. > >>> > >>> Regards, > >>> > >>> Rainer > >>> > >> > > > -- Igor Gali=C4=87 Tel: +43 (0) 664 886 22 883 Mail: i.galic@brainsware.org URL: http://brainsware.org/ GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE