Mailing-List: contact dev-help@apr.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (nike.apache.org: domain of gstein@gmail.com designates
 209.85.220.178 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <9E96BE93-61B7-4924-AEE0-B9F7060774E3@sharp.fm>
References: <20120401120332.EDC48238890B@eris.apache.org>
	<CABD8fLW5mROek5TwNm54u=Wd_GAmSzsoPWVbXbz-LEHyDJrYFQ@mail.gmail.com>
	<9E96BE93-61B7-4924-AEE0-B9F7060774E3@sharp.fm>
Date: Sun, 1 Apr 2012 16:52:03 -0400
Message-ID: 
 <CABD8fLWdfMfZznAiXab3qA6sHCMWdBRrOMkCmAPhLseqX0zbqw@mail.gmail.com>
Subject: Re: svn commit: r1308088 - in /apr/apr-util/branches/1.5.x: ./
 crypto/apr_crypto.c
From: Greg Stein <gstein@gmail.com>
To: Graham Leggett <minfrin@sharp.fm>
Cc: dev@apr.apache.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

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=3D1308088&view=3Drev
>>> Log:
>>> Backport:
>>> apr_crypto: Ensure the *driver variable is initialised when the library
>>> has already been loaded. Fix ported from apr_dbd.
>>>
>>> Modified:
>>> =A0 =A0apr/apr-util/branches/1.5.x/ =A0 (props changed)
>>> =A0 =A0apr/apr-util/branches/1.5.x/crypto/apr_crypto.c
>>>
>>> Propchange: apr/apr-util/branches/1.5.x/
>>> -----------------------------------------------------------------------=
-------
>>> =A0Merged /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?

-g