On Fri, Dec 31, 2010 at 16:07, Dave Page <dpage@pgadmin.org> wrote:
> On Fri, Dec 31, 2010 at 3:03 PM, Magnus Hagander <magnus@hagander.net> wrote:
>> Actually, I take it back.
>>
>> The CHANGELOG on the REL-1_12_PATCHES has some changes for 1.12.1,
>> 1.12.2, 1.12.3. And surprisingly enough also 1.14.0, which certainly
>> didn't exist back then...
>
> Yes - we've done it that way for years.
I know - and it's been itching me for years ;)
>> Which kind of proves my point about the confusion;)
>
> Meh. Someone committed a bad merge. The doesn't mean it hasn't worked
> for the most part.
So, just to be clear:
Something that's backpatched goes into both master and the backpatch CHANGELOG.
And the order in the CHANGELOG is chronological, *not*
version-ordered? (resulting in mixed versions in head, but consistent
version ordering in backbranches)?
--
Magnus Hagander
Me: http://www.hagander.net/
Work: http://www.redpill-linpro.com/
