Re: git: uh-oh

From: Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us>
To: Magnus Hagander <magnus(at)hagander(dot)net>
Cc: Michael Haggerty <mhagger(at)alum(dot)mit(dot)edu>, Max Bowsher <maxb(at)f2s(dot)com>, Robert Haas <robertmhaas(at)gmail(dot)com>, pgsql-hackers <pgsql-hackers(at)postgresql(dot)org>
Subject: Re: git: uh-oh
Date: 2010-09-08 20:26:01
Views: Raw Message | Whole Thread | Download mbox | Resend email
Lists: pgsql-hackers

OK, so I tried a conversion with the it.po hack I showed before; not
trying to fix any of the other instances yet, but just see what happens
with the 8.4.3/8.4.4 case. It's definitely better:

* Marc's 8.4.3 tag commit is now the last ancestor of REL8_4_3, and the
previous commits in the branch are earlier ancestors. No more 8.4.3
as a stub branch.

* it.po is shown as added, not modified, in Peter's 8.4-branch commit
of 2010-05-13.

* The cherrypick additions of xml2.out and xml2.sql no longer reference
it.po too.

But we're not quite there yet. What I find for it.po is these two
commits, which immediately follow the addition of it.po on the main

commit fd0c9e8bbf50f65a6d03a5d5d59e19cf67c7bc94 refs/tags/REL8_4_3
Author: Peter Eisentraut <peter_e(at)gmx(dot)net>
Date: Fri Feb 19 00:40:07 2010 +0000

log addition on branch

D src/bin/pg_dump/po/it.po

commit f345298286359f666211c7555420d147222888bf refs/tags/REL8_4_3
Author: PostgreSQL Daemon <webmaster(at)postgresql(dot)org>
Date: Fri Feb 19 00:40:06 2010 +0000

This commit was manufactured by cvs2svn to create branch 'REL8_4_STABLE'.

Cherrypick from master 2010-02-19 00:40:05 UTC Peter Eisentraut <peter_e(at)gmx(dot)net> 'Translation updates for 9.0alpha4':

A src/bin/pg_dump/po/it.po

The first of these is the made-up deletion commit that I patched into
it.po,v. But why are we getting the "manufactured" commit anyway?
Max, is this what you expected to happen? Can we do better?

regards, tom lane

In response to


Browse pgsql-hackers by date

  From Date Subject
Next Message Peter Eisentraut 2010-09-08 20:36:53 Re: testing plpython3u on 9.0beta3
Previous Message Martijn van Oosterhout 2010-09-08 20:07:29 Re: Interruptible sleeps (was Re: CommitFest 2009-07: Yay, Kevin! Thanks, reviewers!)