Re: test git conversion

From: Kris Jurka <books(at)ejurka(dot)com>
To: Maciek Sakrejda <msakrejda(at)truviso(dot)com>
Cc: Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us>, Marko Kreen <markokr(at)gmail(dot)com>, Dave Cramer <pg(at)fastcrypt(dot)com>, pgsql-jdbc(at)postgresql(dot)org
Subject: Re: test git conversion
Date: 2012-01-20 23:02:57
Message-ID: alpine.BSO.2.00.1201201745340.22048@leary.csoft.net
Views: Raw Message | Whole Thread | Download mbox
Thread:
Lists: pgsql-jdbc

On Tue, 27 Dec 2011, Maciek Sakrejda wrote:

> Ok, some more progress:
>
> I've taken care of all but two of the manufactured commit issues, have
> a step to strip keywords (more on that later), and have done some
> preliminary spot-checks of the generated history.
>
> The two manufactured commits that probably warrant a little more attention:
>
> maciek(at)anemone:~/jdbc-to-git/pgjdbc2git/pgjdbc-checkout$ git log --all
> --grep=manufactured
> commit e64c318487848ebd7dee6b795dc360a3633337e3
> Author: CVS to git conversion script <webmaster(at)postgresql(dot)org>
> Date: Fri Jul 27 10:15:40 2007 +0000
>
> This commit was manufactured by cvs2git to create tag 'REL8_2_505'.
>
> Sprout from REL8_2_STABLE 2007-04-18 08:15:18 UTC Kris Jurka
> <books(at)ejurka(dot)com> 'Prepare for release of 8.2-505.'
> Cherrypick from master 2007-07-27 10:15:39 UTC Kris Jurka
> <books(at)ejurka(dot)com> 'Remove unused imports.':
> META-INF/services/java.sql.Driver
> org/postgresql/test/jdbc4/Jdbc4TestSuite.java
> org/postgresql/test/jdbc4/LOBTest.java
>

This tag should never have been applied to these three files. I'm not
sure how that happened, but please just remove the tag from these files.

> commit bb06ce11331182c6e0cb73adc6e494c4b92da8c1
> Author: CVS to git conversion script <webmaster(at)postgresql(dot)org>
> Date: Mon Oct 12 02:45:46 1998 +0000
>
> This commit was manufactured by cvs2git to create branch 'REL6_4'.
>
> Sprout from master 1998-10-12 02:45:45 UTC Bruce Momjian
> <bruce(at)momjian(dot)us> 'This patch updates the ImageViewer example to use
> Multiple Threading.'
> Delete:
> postgresql/ChangeLog
> postgresql/PG_Object.java
> postgresql/PGbox.java
> postgresql/PGcircle.java
> postgresql/PGlseg.java
> postgresql/PGpath.java
> postgresql/PGpoint.java
> postgresql/PGpolygon.java
> postgresql/PGtokenizer.java

I don't have any context for this ancient change, but I've done a little
digging, and I believe the historical action was:

1) Make some modifications.
2) Remove the files in the generated commit.
3) Branch the REL6_4 release.

I think anytime the last action before a branch is a delete, cvs2git
will be confused because the deleted files don't get tagged, so the
branch date comes from the last non-delete modification and it doesn't see
the deletes as occuring before the branch.

What we want is the REL6_4 branch point to be after the delete
commit.

Kris Jurka

In response to

Responses

Browse pgsql-jdbc by date

  From Date Subject
Next Message Віталій Тимчишин 2012-01-21 22:22:35 Re: NIO support
Previous Message John Lister 2012-01-20 19:32:26 Array helper patch