Re: git: uh-oh

On 03/09/10 03:34, Max Bowsher wrote:
>>>> Robert Haas wrote:
>>>>> On Thu, Sep 2, 2010 at 8:13 AM, Michael Haggerty <mhagger@alum.mit.edu> wrote:
>>>>>> What weirdness, exactly, are you discussing now?  I've lost track of
>>>>>> which problem(s) are still unresolved.
>>>>> Lots of commits that look like this:
>>>>>
>>>>> commit c50da22b6050e0bdd5e2ef97541d91aa1d2e63fb
>>>>> Author: PostgreSQL Daemon <webmaster@postgresql.org>
>>>>> Date:   Sat Dec 2 08:36:42 2006 +0000
>>>>>
>>>>>     This commit was manufactured by cvs2svn to create branch 'REL8_2_STABLE'.
>>>>>
>>>>>     Sprout from master 2006-12-02 08:36:41 UTC PostgreSQL Daemon
>>>>> <webmaster@postgresql.org> ''
>>>>>     Delete:
>>>>>         src/backend/parser/gram.c
>>>>>         src/interfaces/ecpg/preproc/pgc.c
>>>>>         src/interfaces/ecpg/preproc/preproc.c

> I have a test conversion running (well, a test conversion to bzr,
> because I like qbzr so much more than gitk) and will report back.

OK, so I ran a conversion first run the following:

for r in 2.89 2.90 2.91; do rcs -x,v -sdead:$r
./cvsroot/pgsql/src/backend/parser/Attic/gram.c ; done
for r in 1.3 1.4 1.5 1.6; do rcs -x,v -sdead:$r
./cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/pgc.c ; done
for r in 1.7 1.8 1.9 1.10 1.11 1.12; do rcs -x,v -sdead:$r
./cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.c ; done

(in essence "pretend that these revisions deleted the file instead of
changing it")

The conversion looks nicer, but I notice we have a similar issue to
those three with src/interfaces/ecpg/preproc/y.tab.h in release
tags/branches up to and including 7.4.

So, I'm going to try running another attempt additionally doing:

for r in 1.3 1.4 1.5 1.6 1.7 1.8; do rcs -x,v -sdead:$r
./cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/y.tab.h ; done

... churn churn churn ...

and the result is that things are looking pretty clean :-)

You now need to decide if you can live with throwing away a little bit
of history for those four files to get a cleaner conversion.


Max.