On Wed, May 27, 2009 at 5:22 PM, Aidan Van Dyk <aidan@highrise.ca> wrote:
> gpo: from git://git.postgresql.org/git/postgresql.git
> git: from git://repo.or.cz/PostgreSQL.git
[...]
> 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 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...
This is really quite horrible. What is the best way forward here?
...Robert