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

help / color / mirror / Atom feed
From: Magnus Hagander <magnus@hagander.net>
To: Robert Haas <robertmhaas@gmail.com>
Cc: Greg Stark <stark@enterprisedb.com>
Cc: Andres Freund <andres@anarazel.de>
Cc: Markus Wanner <markus@bluegap.ch>
Cc: Marko Kreen <markokr@gmail.com>
Cc: Aidan Van Dyk <aidan@highrise.ca>
Cc: Heikki Linnakangas <heikki.linnakangas@enterprisedb.com>
Cc: Andrew Dunstan <andrew@dunslane.net>
Cc: PostgreSQL-development <pgsql-hackers@postgresql.org>
Subject: Re: PostgreSQL Developer meeting minutes up
Date: Wed, 03 Jun 2009 16:18:10 +0200
Message-ID: <4A268622.90608@hagander.net> (raw)
In-Reply-To: <603c8f070906030717h267221c3uc7f0d971ae82b0b2@mail.gmail.com>
References: <20090526144812.GC15213@yugib.highrise.ca>
	<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>
	<4A2684FC.2070006@hagander.net>
	<603c8f070906030717h267221c3uc7f0d971ae82b0b2@mail.gmail.com>

Robert Haas wrote:
> On Wed, Jun 3, 2009 at 10:13 AM, Magnus Hagander <magnus@hagander.net> wrote:
>>> I'm not sure whether we should mark the old branches getting merges
>>> down or the new branches getting merged up. I suspect I'm missing
>>> something but I don't see any reason one is better than the other.
>> If you go from older to newer, the automatic merge algorithms have a
>> better chance of doing something smart since they can track previous
>> changes. At least I think that's how it works.
>>
>> But I think for most of the changes it wouldn't make a huge difference,
>> though - manual merging would be needed anyway.
> 
> In practice, isn't it more likely that you would develop the change on
> the newest branch and then try to back-port it?  However you do the
> import, you're going to want to do subsequent things the same way.

That's definitely the order in which *I* work, and I think that's how
most others do it as well.


-- 
 Magnus Hagander
 Self: http://www.hagander.net/
 Work: http://www.redpill-linpro.com/



view thread (83+ messages)  latest in thread

Message-ID: <4A268622.90608@hagander.net>
Permalink:  ../4A268622.90608@hagander.net/
Also on:    postgresql.org/message-id/4A268622.90608@hagander.net

 · 

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: magnus@hagander.net, robertmhaas@gmail.com, stark@enterprisedb.com, andres@anarazel.de, markus@bluegap.ch, markokr@gmail.com, aidan@highrise.ca, heikki.linnakangas@enterprisedb.com, andrew@dunslane.net
  Subject: Re: PostgreSQL Developer meeting minutes up
  In-Reply-To: <4A268622.90608@hagander.net>

* 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