Message-ID: <4A2552D6.101@cheapcomplexdevices.com>
Date: Tue, 02 Jun 2009 09:27:02 -0700
From: Ron Mayer <rm_pg@cheapcomplexdevices.com>
User-Agent: Thunderbird 2.0.0.21 (X11/20090318)
MIME-Version: 1.0
To: Aidan Van Dyk <aidan@highrise.ca>
CC: Markus Wanner <markus@bluegap.ch>, Marko Kreen <markokr@gmail.com>,
	Heikki Linnakangas <heikki.linnakangas@enterprisedb.com>,
	Magnus Hagander <magnus@hagander.net>,
	Andrew Dunstan <andrew@dunslane.net>,
	PostgreSQL-development <pgsql-hackers@postgresql.org>
Subject: Re: PostgreSQL Developer meeting minutes up
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>
In-Reply-To: <20090602145000.GE23972@yugib.highrise.ca>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit

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.