Re: PostgreSQL Developer meeting minutes up

* Heikki Linnakangas <heikki(dot)linnakangas(at)enterprisedb(dot)com> [090527 07:29]:

> OTOH, there's some value in staying with current GIT repository. In
> EnterpriseDB, we maintain all the Oracle-compatibility stuff in a GIT
> repository that's based on the PostgreSQL mirror. If PostgreSQL switches
> to a new GIT repository/mirror, I'll have to rebase all that, and I'm
> not sure how well that works with all the merges and stuff. I'm probably
> the one with most complex situation, but others who have
> work-in-progress patches in local repositories will face the same issue
> 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 renoir.op.net (o1/$Revision: 1.2 $) with ESMTP id BAA27265 for <pgman(at)candle(dot)pha(dot)pa(dot)us>; 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 renoir.op.net (o1/$Revision$) with ESMTP id BAA 27265 for <pgman(at)candle(dot)pha(dot)pa(dot)us>; 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/contrib/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.c
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 deletions(-)
pg-git-REL2_0B.diff 2 files changed, 2 insertions(+), 2 deletions(-)
pg-git-REL6_4.diff 14 files changed, 53 insertions(+), 13 deletions(-)
pg-git-REL6_5_PATCHES.diff 20 files changed, 67 insertions(+), 20 deletions(-)
pg-git-REL7_0_PATCHES.diff 7 files changed, 12 insertions(+), 7 deletions(-)
pg-git-REL7_1_STABLE.diff 24 files changed, 149 insertions(+), 146 deletions(-)
pg-git-REL7_2_STABLE.diff 30 files changed, 153 insertions(+), 150 deletions(-)
pg-git-REL7_3_STABLE.diff 59 files changed, 1457 insertions(+), 167 deletions(-)
pg-git-REL7_4_STABLE.diff 53 files changed, 172 insertions(+), 169 deletions(-)
pg-git-REL8_0_0.diff 26 files changed, 44 insertions(+), 28 deletions(-)
pg-git-REL8_0_STABLE.diff 26 files changed, 44 insertions(+), 28 deletions(-)
pg-git-REL8_1_STABLE.diff 25 files changed, 26 insertions(+), 26 deletions(-)
pg-git-REL8_2_STABLE.diff 24 files changed, 26 insertions(+), 26 deletions(-)
pg-git-REL8_3_STABLE.diff 23 files changed, 25 insertions(+), 25 deletions(-)
pg-git-Release_1_0_3.diff 2 files changed, 2 insertions(+), 2 deletions(-)
pg-git-WIN32_DEV.diff 53 files changed, 172 insertions(+), 169 deletions(-)
pg-git-ecpg_big_bison.diff 0 files changed
pg-git-master.diff 81 files changed, 85 insertions(+), 85 deletions(-)
TOTAL 234 files changed, 2491 insertions(+), 1065 deletions(-)

But the gpo conversion seems to be in pretty bad shape:
aidan(at)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 deletions(-)
pg-gpo-REL2_0B.diff 2 files changed, 2 insertions(+), 2 deletions(-)
pg-gpo-REL6_4.diff 12 files changed, 51 insertions(+), 11 deletions(-)
pg-gpo-REL6_5_PATCHES.diff 12 files changed, 59 insertions(+), 12 deletions(-)
pg-gpo-REL7_0_PATCHES.diff 3 files changed, 8 insertions(+), 3 deletions(-)
pg-gpo-REL7_1_STABLE.diff 22 files changed, 147 insertions(+), 144 deletions(-)
pg-gpo-REL7_2_STABLE.diff 30 files changed, 153 insertions(+), 150 deletions(-)
pg-gpo-REL7_3_STABLE.diff 58 files changed, 925 insertions(+), 167 deletions(-)
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 deletions(-)
pg-gpo-REL8_0_STABLE.diff 206 files changed, 16289 insertions(+), 11798 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 deletions(-)
pg-gpo-REL8_3_STABLE.diff 23 files changed, 25 insertions(+), 25 deletions(-)
pg-gpo-Release_1_0_3.diff 2 files changed, 2 insertions(+), 2 deletions(-)
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 deletions(-)
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
from... 8.2, 8.3, and master(HEAD) are all the same as my gpo repo, but the
back branchs are very bad...

a.

--
Aidan Van Dyk Create like a god,
aidan(at)highrise(dot)ca command like a king,
http://www.highrise.ca/ work like a slave.