agora inbox for pgsql-hackers@postgresql.org
help / color / mirror / Atom feedFrom: Ron Mayer <rm_pg@cheapcomplexdevices.com>
To: Aidan Van Dyk <aidan@highrise.ca>
Cc: Markus Wanner <markus@bluegap.ch>
Cc: Marko Kreen <markokr@gmail.com>
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: Tue, 02 Jun 2009 09:27:02 -0700
Message-ID: <4A2552D6.101@cheapcomplexdevices.com> (raw)
In-Reply-To: <20090602145000.GE23972@yugib.highrise.ca>
References: <20090529170559.99155w414h94hazb@mail.bluegap.ch>
<20090529151228.GZ15213@yugib.highrise.ca>
<20090529171818.89937lf3o1oyzfsq@mail.bluegap.ch>
<20090529153435.GA15213@yugib.highrise.ca>
<4A241340.9080903@bluegap.ch>
<e51f66da0906012343r46aaeef1ve38a442140821412@mail.gmail.com>
<e51f66da0906020013w1f4152f5xd7c1287eb77d4f00@mail.gmail.com>
<20090602134831.186767ksvmsgj8gf@mail.bluegap.ch>
<e51f66da0906020546l578e56c8m52f5a6e10760eaf9@mail.gmail.com>
<20090602162333.369974jcc3jpn3dx@mail.bluegap.ch>
<20090602145000.GE23972@yugib.highrise.ca>
Aidan Van Dyk wrote:
> * Markus Wanner <markus@bluegap.ch> [090602 10:23]:
>> As mentioned before, I'd personally favor *all* of the back-ports to
>> actually be merges of some sort, because that's what they effectively
>> are. However, that also bring up the question of how we are going to do
>> back-patches in the future with git.
>
> Well, if people get comfortable with it, I expect that "backports" don't
> happenen.. Bugs are fixed where they happen, and "merged" forward into
> all affected "later development" based on the bugged area.
I imagine the closest thing to existing practices would be that people
would to use "git-cherry-pick -x -n" to backport only the commits they
wanted from the current branch into the back branches.
AFAICT, this doesn't record a merge in the GIT history, but looks a lot
like the linear history from CVS - with the exception that the comment
added by "-x" explicitly refers to the exact commit from the main branch.
view thread (84+ messages) latest in thread
Message-ID: <4A2552D6.101@cheapcomplexdevices.com>
Permalink: ../../4A2552D6.101@cheapcomplexdevices.com/
Also on: postgresql.org/message-id/4A2552D6.101@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, aidan@highrise.ca, markus@bluegap.ch, markokr@gmail.com, heikki.linnakangas@enterprisedb.com, magnus@hagander.net, andrew@dunslane.net
Subject: Re: PostgreSQL Developer meeting minutes up
In-Reply-To: <4A2552D6.101@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