apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Greg Stein <gst...@gmail.com>
Subject Re: svn commit: r1308088 - in /apr/apr-util/branches/1.5.x: ./ crypto/apr_crypto.c
Date Sun, 01 Apr 2012 20:52:52 GMT
On Sun, Apr 1, 2012 at 16:52, Greg Stein <gstein@gmail.com> wrote:
> On Sun, Apr 1, 2012 at 16:49, Graham Leggett <minfrin@sharp.fm> wrote:
>> On 01 Apr 2012, at 10:46 PM, Greg Stein wrote:
>>
>>>> URL: http://svn.apache.org/viewvc?rev=1308088&view=rev
>>>> Log:
>>>> Backport:
>>>> apr_crypto: Ensure the *driver variable is initialised when the library
>>>> has already been loaded. Fix ported from apr_dbd.
>>>>
>>>> Modified:
>>>>    apr/apr-util/branches/1.5.x/   (props changed)
>>>>    apr/apr-util/branches/1.5.x/crypto/apr_crypto.c
>>>>
>>>> Propchange: apr/apr-util/branches/1.5.x/
>>>> ------------------------------------------------------------------------------
>>>>  Merged /apr/apr/trunk:r1308087
>>>
>>> How is this a merge of -087 ? Where is the CHANGES edit?
>>
>> In apr-util v1.4.
>
> I'm aware that the edit made it to 1.4 ... I'm asking: this commit is
> a merge of -131, but the edit to CHANGES is missing. Therefore, it is
> NOT a proper merge. Where did the edit to CHANGES go?

-087, I meant.

A proper merge should include all changes. Not just a portion of the
revision. Where did CHANGES go?

Mime
View raw message