Received: from maia.hub.org (unknown [200.46.204.183]) by mail.postgresql.org (Postfix) with ESMTP id 34803633A01 for ; Wed, 27 May 2009 18:22:46 -0300 (ADT) Received: from mail.postgresql.org ([200.46.204.86]) by maia.hub.org (mx1.hub.org [200.46.204.183]) (amavisd-maia, port 10024) with ESMTP id 66282-07 for ; Wed, 27 May 2009 18:22:43 -0300 (ADT) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from oak.highrise.ca (oak.highrise.ca [70.38.99.169]) by mail.postgresql.org (Postfix) with ESMTP id 1A0F56338E2 for ; Wed, 27 May 2009 18:22:43 -0300 (ADT) Received: from localhost (localhost [127.0.0.1]) by oak.highrise.ca (Postfix) with ESMTP id C9632AC428; Wed, 27 May 2009 17:22:40 -0400 (EDT) Date: Wed, 27 May 2009 17:22:40 -0400 From: Aidan Van Dyk To: Heikki Linnakangas Cc: Magnus Hagander , Markus Wanner , Andrew Dunstan , PostgreSQL-development Subject: Re: PostgreSQL Developer meeting minutes up Message-ID: <20090527212240.GP15213@yugib.highrise.ca> References: <4A1A52F5.7030009@hagander.net> <20090525122821.GO8123@tamriel.snowman.net> <4A1BABBC.7070803@hagander.net> <4A1BE039.70008@dunslane.net> <10273.1243343651@sss.pgh.pa.us> <4A1BFF70.4000506@dunslane.net> <20090526144812.GC15213@yugib.highrise.ca> <20090527121532.83276r2btyqp716s@mail.bluegap.ch> <4A1D1E64.6030908@hagander.net> <4A1D2290.7060907@enterprisedb.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="U0B5otXy6WXfork9" Content-Disposition: inline In-Reply-To: <4A1D2290.7060907@enterprisedb.com> User-Agent: Mutt/1.5.18 (2008-05-17) X-Virus-Scanned: Maia Mailguard 1.0.1 X-Spam-Status: No, hits=0 tagged_above=0 required=5 tests=none X-Spam-Level: X-Archive-Number: 200905/1147 X-Sequence-Number: 138689 --U0B5otXy6WXfork9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Heikki Linnakangas [090527 07:29]: > OTOH, there's some value in staying with current GIT repository. In =20 > EnterpriseDB, we maintain all the Oracle-compatibility stuff in a GIT =20 > repository that's based on the PostgreSQL mirror. If PostgreSQL switches = =20 > to a new GIT repository/mirror, I'll have to rebase all that, and I'm =20 > not sure how well that works with all the merges and stuff. I'm probably = =20 > the one with most complex situation, but others who have =20 > work-in-progress patches in local repositories will face the same issue = =20 > at a smaller scale. OK, so I took a gander at the git repositories out there, namely the "official" one (I'll call gpo) and the "original" (I'll call git): gpo: from git://git.postgresql.org/git/postgresql.git git: from git://repo.or.cz/PostgreSQL.git For each branch, I diffed them to a cvs export of that sticky tag they are on. Diffs are available here: http://people.ifax.com/~aidan/pg/pg-git-cvs/ Since I run the git version of the conversion, I took a close look at that one... All the differences in it (excpet for the 7.3 ones I'll mention in a minute) are $Keyword$ differences, stuff like: -# My2Pg \$Revision: 1.27 $ \translated dump +# My2Pg \$Revision$ \translated dump and -/* $OpenBSD$ */ +/* $OpenBSD: blf.c,v 1.3 2000/06/17 23:36:22 provos Exp $ */ Here, - is git and + is cvs, so you can see, my conversion has some even backwards... And some are ugly: -Received: from sss2.sss.pgh.pa.us (sss.pgh.pa.us [209.114.166.2]) by reno= ir.op.net (o1/$Revision: 1.2 $) with ESMTP id BAA27265 for ; Sat, 10 Jun 2000 01:16:07 -0400 (EDT) +Received: from sss2.sss.pgh.pa.us (sss.pgh.pa.us [209.114.166.2]) by reno= ir.op.net (o1/$Revision$) with ESMTP id BAA 27265 for ; Sat, 10 Jun 2000 01:16:07 -0400 (EDT) My conversion left the $Revision$ alone in the mail message, and the cvs checkout munged it... Actually, notice how stuff like src/backend/optimizer/plan/README has keywords in it that CVS munches too, ugh!) And the $Log$ Keyword make for some huge differences ;-( But there seems to be some files "missing" in my REL7_3_STABLE, namely: pg-git-REL7_3_STABLE.diff-diff --git a/contrib/xml/README.pgxml b/contrib/= xml/README.pgxml pg-git-REL7_3_STABLE.diff-diff --git a/contrib/xml/pgxml.sql.in b/contrib/= xml/pgxml.sql.in pg-git-REL7_3_STABLE.diff-diff --git a/contrib/xml/pgxml_dom.sql.in b/cont= rib/xml/pgxml_dom.sql.in pg-git-REL7_3_STABLE.diff-diff --git a/src/bin/pg_controldata/po/zh_CN.po = b/src/bin/pg_controldata/po/zh_CN.po pg-git-REL7_3_STABLE.diff-diff --git a/src/bin/pg_resetxlog/po/zh_CN.po b/= src/bin/pg_resetxlog/po/zh_CN.po pg-git-REL7_3_STABLE.diff-diff --git a/src/port/getopt.c b/src/port/getopt= =2Ec pg-git-REL7_3_STABLE.diff-diff --git a/src/test/regress/expected/geometry-= bsd-precision.out b/src/test/regress/expected/geometry-bsd-precision.out I'm not really sure why, I can look into it if it's important... But in all, the differneces are small and otherwise all keyword related: pg-git-MANUAL_DIST.diff 0 files changed pg-git-PG95-DIST.diff 0 files changed pg-git-PG95_DIST.diff 2 files changed, 2 insertions(+), 2 deletio= ns(-) pg-git-REL2_0B.diff 2 files changed, 2 insertions(+), 2 deletio= ns(-) pg-git-REL6_4.diff 14 files changed, 53 insertions(+), 13 dele= tions(-) pg-git-REL6_5_PATCHES.diff 20 files changed, 67 insertions(+), 20 dele= tions(-) pg-git-REL7_0_PATCHES.diff 7 files changed, 12 insertions(+), 7 deleti= ons(-) pg-git-REL7_1_STABLE.diff 24 files changed, 149 insertions(+), 146 de= letions(-) pg-git-REL7_2_STABLE.diff 30 files changed, 153 insertions(+), 150 de= letions(-) pg-git-REL7_3_STABLE.diff 59 files changed, 1457 insertions(+), 167 d= eletions(-) pg-git-REL7_4_STABLE.diff 53 files changed, 172 insertions(+), 169 de= letions(-) pg-git-REL8_0_0.diff 26 files changed, 44 insertions(+), 28 dele= tions(-) pg-git-REL8_0_STABLE.diff 26 files changed, 44 insertions(+), 28 dele= tions(-) pg-git-REL8_1_STABLE.diff 25 files changed, 26 insertions(+), 26 dele= tions(-) pg-git-REL8_2_STABLE.diff 24 files changed, 26 insertions(+), 26 dele= tions(-) pg-git-REL8_3_STABLE.diff 23 files changed, 25 insertions(+), 25 dele= tions(-) pg-git-Release_1_0_3.diff 2 files changed, 2 insertions(+), 2 deletio= ns(-) pg-git-WIN32_DEV.diff 53 files changed, 172 insertions(+), 169 de= letions(-) pg-git-ecpg_big_bison.diff 0 files changed pg-git-master.diff 81 files changed, 85 insertions(+), 85 dele= tions(-) TOTAL 234 files changed, 2491 insertions(+= ), 1065 deletions(-) But the gpo conversion seems to be in pretty bad shape: aidan@db1-dapper:/tmp$ grep 'new file' pg-gpo-* | wc 301 1245 14096 pg-gpo-MANUAL_DIST.diff 0 files changed pg-gpo-PG95-DIST.diff 0 files changed pg-gpo-PG95_DIST.diff 2 files changed, 2 insertions(+), 2 deletio= ns(-) pg-gpo-REL2_0B.diff 2 files changed, 2 insertions(+), 2 deletio= ns(-) pg-gpo-REL6_4.diff 12 files changed, 51 insertions(+), 11 dele= tions(-) pg-gpo-REL6_5_PATCHES.diff 12 files changed, 59 insertions(+), 12 dele= tions(-) pg-gpo-REL7_0_PATCHES.diff 3 files changed, 8 insertions(+), 3 deletio= ns(-) pg-gpo-REL7_1_STABLE.diff 22 files changed, 147 insertions(+), 144 de= letions(-) pg-gpo-REL7_2_STABLE.diff 30 files changed, 153 insertions(+), 150 de= letions(-) pg-gpo-REL7_3_STABLE.diff 58 files changed, 925 insertions(+), 167 de= letions(-) pg-gpo-REL7_4_STABLE.diff 136 files changed, 43302 insertions(+), 169= deletions(-) pg-gpo-REL8_0_0.diff 31 files changed, 2288 insertions(+), 28 de= letions(-) pg-gpo-REL8_0_STABLE.diff 206 files changed, 16289 insertions(+), 117= 98 deletions(-) pg-gpo-REL8_1_STABLE.diff 155 files changed, 24386 insertions(+), 26 = deletions(-) pg-gpo-REL8_2_STABLE.diff 24 files changed, 26 insertions(+), 26 dele= tions(-) pg-gpo-REL8_3_STABLE.diff 23 files changed, 25 insertions(+), 25 dele= tions(-) pg-gpo-Release_1_0_3.diff 2 files changed, 2 insertions(+), 2 deletio= ns(-) pg-gpo-WIN32_DEV.diff 119 files changed, 16637 insertions(+), 169= deletions(-) pg-gpo-ecpg_big_bison.diff 0 files changed pg-gpo-master.diff 81 files changed, 85 insertions(+), 85 dele= tions(-) TOTAL 627 files changed, 104387 insertions= (+), 12819 deletions(-) And actually looking at the history of the gpo repo, the branches are all messed up with "merges" and stuff that I'm not sure where they are coming =66rom... 8.2, 8.3, and master(HEAD) are all the same as my gpo repo, but = the back branchs are very bad... a. --=20 Aidan Van Dyk Create like a god, aidan@highrise.ca command like a king, http://www.highrise.ca/ work like a slave. --U0B5otXy6WXfork9 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iD8DBQFKHa8guVxNPsxNPScRArV1AKCh4n4y9faDHHO0uGXdp9sVkQZy5QCgj6sp Rw6pc8XvqQo3ezMRhWJCag4= =8s6c -----END PGP SIGNATURE----- --U0B5otXy6WXfork9--