pg.ddx.io  pgsql-hackers@postgresql.org mailing list archive  

help / color / mirror / Atom feed
From: Markus Wanner <markus@bluegap.ch>
To: Tom Lane <tgl@sss.pgh.pa.us>
Cc: Ron Mayer <rm_pg@cheapcomplexdevices.com>
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: Sat, 06 Jun 2009 17:40:54 +0200
Message-ID: <4A2A8E06.2080204@bluegap.ch> (raw)
In-Reply-To: <2871.1244209112@sss.pgh.pa.us>
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>
	<4A283A8D.8030600@cheapcomplexdevices.com>
	<20090605090514.11712ntlvhi2deay@mail.bluegap.ch>
	<2871.1244209112@sss.pgh.pa.us>

Hi,

Tom Lane wrote:
> I think it's already been made crystal clear that the people who
> actually do this work don't do it that way, and are uninterested in
> allowing their tools to force them to do it that way.

That's well understood.

> Patching from
> HEAD back works better for us for a number of reasons, the main one
> being that HEAD is the version of the code that's most "swapped into"
> our awareness.

Committing on the oldest back-branch first doesn't necessarily mean
having to develop the patch there.

> However, so long as we can have a separate working copy per branch,
> I see no problem with preparing all the versions of a patch and then
> committing them back-to-front.

That's what I think as well.

However, I bet git could help a lot with creating all the versions of a
patch in the first place. You don't *need* to use that feature, but
preserving the option could help.

> What I'm not clear about is the
> mechanics for doing that.

If you create each of the patches individually, there's not much magic
required from git. It should be trivial to commit those as merges.

> Would someone explain exactly what the
> steps should be to produce the nicest-looking git history?

I fear the cherry-picking approach creates the "nicest-looking" history
(especially to the CVS trained eye).

Regards

Markus Wanner



view thread (83+ messages)  latest in thread

Message-ID: <4A2A8E06.2080204@bluegap.ch>
Permalink:  ../4A2A8E06.2080204@bluegap.ch/
Also on:    postgresql.org/message-id/4A2A8E06.2080204@bluegap.ch

 · 

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: markus@bluegap.ch, tgl@sss.pgh.pa.us, rm_pg@cheapcomplexdevices.com, 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: <4A2A8E06.2080204@bluegap.ch>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox