httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Greg Stein <gst...@gmail.com>
Subject Re: SVN question (Was: Re: log-message-tags)
Date Wed, 07 Mar 2012 11:40:43 GMT
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.

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 <jim@jagunet.com> wrote:
> Never mind, I hope I did it correctly :)
>
>   % cat la
>   log-message-tags https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/log-message-tags
>   % pwd
>   blahblah.../dev/httpd-2.4/docs
>   % svn propset svn:externals . -F la
>   property 'svn:externals' set on '.'
>   % svn up
>   Fetching external item into 'log-message-tags':
>   A    log-message-tags/update-log-msg-tags
>   A    log-message-tags/find-messages.cocci
>   A    log-message-tags/next-number
>   A    log-message-tags/macros.h
>   A    log-message-tags/README
>   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
>>>>> ===========
>>>>>
>>>>> 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
>>>
>>
>

Mime
View raw message