DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:in-reply-to:references:date:message-id:subject:from:to
	:cc:content-type:content-transfer-encoding;
	b=I6w5G1vf65GoQmMZmDVdDVfBx3kC5rUXGym4Xxy7jCfD7GtphjRDVdJBOJV6fRkyzW
	y23ZdW5QCFAilD78raDw5s4GHzp2x8gh1oIIGqITHNG0KWEwC5Ck6YgnSQzxEg1LcrYw
	7gkqXqyQth3/TXXjk05ZJ9FQIgJNzXopgzdpk=
MIME-Version: 1.0
In-Reply-To: <4136ffa0906030701x200bf0e4o4c77fa3239062ca5@mail.gmail.com>
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>
Date: Wed, 3 Jun 2009 17:20:24 +0300
Message-ID: <e51f66da0906030720u33d72d05y14ea5ce002cbaf1e@mail.gmail.com>
Subject: Re: PostgreSQL Developer meeting minutes up
From: Marko Kreen <markokr@gmail.com>
To: Greg Stark <stark@enterprisedb.com>
Cc: Andres Freund <andres@anarazel.de>, Markus Wanner <markus@bluegap.ch>,
	Aidan Van Dyk <aidan@highrise.ca>,
	Heikki Linnakangas <heikki.linnakangas@enterprisedb.com>,
	Magnus Hagander <magnus@hagander.net>,
	Andrew Dunstan <andrew@dunslane.net>,
	PostgreSQL-development <pgsql-hackers@postgresql.org>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

On 6/3/09, Greg Stark <stark@enterprisedb.com> wrote:
> On Wed, Jun 3, 2009 at 1:19 PM, Andres Freund <andres@anarazel.de> wrote:
>  > "git log --no-merges" hides the actual merge commits if that is what you
>  > want.
>
>
> Ooh! Life seems so much sweeter now!
>
>  Given that we don't have to see them then I'm all for marking bug fix
>  patches which were applied to multiple branches as merges. That seems
>  like it would make it easier for tools like gitk or to show useful
>  information analogous to the cvs2pcl info.
>
>  Given that Tom's been intentionally marking the commits with identical
>  commit messages we ought to be able to find *all* of them and mark
>  them properly. That would be way better than only finding patches that
>  are absolutely identical.
>
>  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.

Although "mark Tom's back-branch fixes as merges" makes much more
sense than "mark new files as merges", it is quite a step up from
"do tags match official releases".

It seems to require noticeable development effort to get a importer
to a level it can do it.  Will this be a requirement for import?
Or just a good thing to have?  Also how to check if all such merges
are sensible?

And note that such effort will affect only old imported history,
it will not make easier to handle back-branch fixes in the future...

Various scenarios with git cherry-pick and similar tools would still
result in duplicate commits, so we would need a git log post-processor
anyway if we want to somehow group them together for eg. weekly commit
summary.  And such post-processor would work on old history too.

Maybe that's better direction to work on, than to potentially risk in
messy history in GIT?

-- 
marko