agora inbox for pgsql-hackers@postgresql.org
help / color / mirror / Atom feedFrom: Ron Mayer <rm_pg@cheapcomplexdevices.com>
To: Markus Wanner <markus@bluegap.ch>
Cc: Marko Kreen <markokr@gmail.com>
Cc: Greg Stark <stark@enterprisedb.com>
Cc: Andres Freund <andres@anarazel.de>
Cc: Aidan Van Dyk <aidan@highrise.ca>
Cc: Heikki Linnakangas <heikki.linnakangas@enterprisedb.com>
Cc: Magnus Hagander <magnus@hagander.net>
Cc: Andrew Dunstan <andrew@dunslane.net>
Cc: PostgreSQL-development <pgsql-hackers@postgresql.org>
Subject: Re: PostgreSQL Developer meeting minutes up
Date: Thu, 04 Jun 2009 14:20:13 -0700
Message-ID: <4A283A8D.8030600@cheapcomplexdevices.com> (raw)
In-Reply-To: <20090604114610.808217tbogts0noi@mail.bluegap.ch>
References: <20090526144812.GC15213@yugib.highrise.ca>
<e51f66da0906020546l578e56c8m52f5a6e10760eaf9@mail.gmail.com>
<20090602162333.369974jcc3jpn3dx@mail.bluegap.ch>
<e51f66da0906020834q7e6e3401jf77f40f9924bbace@mail.gmail.com>
<20090602180702.15986cp384yo3l7q@mail.bluegap.ch>
<e51f66da0906020917m274debd5u3288d6d56b62daf7@mail.gmail.com>
<20090603131004.12934iyrr4f7rlsc@mail.bluegap.ch>
<4136ffa0906030508i2971790dk54a8203ee03ed196@mail.gmail.com>
<4A266A56.2020703@anarazel.de>
<4136ffa0906030701x200bf0e4o4c77fa3239062ca5@mail.gmail.com>
<e51f66da0906030720u33d72d05y14ea5ce002cbaf1e@mail.gmail.com>
<20090604114610.808217tbogts0noi@mail.bluegap.ch>
Markus Wanner wrote:
> The "new branches getting merged up" could work. That is, applying the
> fix to the oldest back-branch which requires the fix first and then
> merge it to all newer ones, including HEAD. However, that would require
> some rethinking: instead of creating bugfix-patches for HEAD, then
> manually adjust patches for back-branches and then group committing,
> you'd have to create a bugfix-patch for the oldest branch first, commit
> that and then merge that to the newer branches.
That sounds a bit dangerous too, since I imagine there are some
changes in the old release branches you wouldn't want merged into
the newest releases (say, code affecting sections that got redesigned).
Seems you'd want to do is create a new branch as close to the point
where the bug was introduced - and then merge that forward into each
of the branches. This concept was mentioned in a page linked earlier
in the thread[1] and seems like the way monotone recommends people
use their system[2]. See that page for more reasons why they think
it's good.
[1]http://archives.postgresql.org/pgsql-hackers/2009-06/msg00153.php
[2]http://www.monotone.ca/wiki/DaggyFixes/
view thread (84+ messages) latest in thread
Message-ID: <4A283A8D.8030600@cheapcomplexdevices.com>
Permalink: ../../4A283A8D.8030600@cheapcomplexdevices.com/
Also on: postgresql.org/message-id/4A283A8D.8030600@cheapcomplexdevices.com
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-hackers@postgresql.org
Cc: rm_pg@cheapcomplexdevices.com, markus@bluegap.ch, markokr@gmail.com, stark@enterprisedb.com, andres@anarazel.de, aidan@highrise.ca, heikki.linnakangas@enterprisedb.com, magnus@hagander.net, andrew@dunslane.net
Subject: Re: PostgreSQL Developer meeting minutes up
In-Reply-To: <4A283A8D.8030600@cheapcomplexdevices.com>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox