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@anemone:~/jdbc-to-git/pgjdbc2git/pgjdbc-checkout$ git log --all
--grep=manufactured
commit e64c318487848ebd7dee6b795dc360a3633337e3
Author: CVS to git conversion script <webmaster@postgresql.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@ejurka.com> 'Prepare for release of 8.2-505.'
Cherrypick from master 2007-07-27 10:15:39 UTC Kris Jurka
<books@ejurka.com> 'Remove unused imports.':
META-INF/services/java.sql.Driver
org/postgresql/test/jdbc4/Jdbc4TestSuite.java
org/postgresql/test/jdbc4/LOBTest.java
commit bb06ce11331182c6e0cb73adc6e494c4b92da8c1
Author: CVS to git conversion script <webmaster@postgresql.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@momjian.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
The first of these is weird because it's actually a *tag*. The second
is weird because it's a number of deletions back-patched into REL6_4
(which seems to be a stub branch with only a single commit), with an
irrelevant commit message. I'm happy to pull the standard metadata
wrangling for these as well, but I'd like to understand what's going
on here if someone with more repo history knowledge has some insight.
I've also run Marko's verify script and the diffs seem benign (some
keyword expansion stuff). As I understand from reading the core
PostgreSQL lists, the solution taken there was to port over with
expansion, and then kill expansion on all active branches in a series
of post-conversion commits. Is that acceptable here?
Any other questions or comments?
Thanks,
---
Maciek Sakrejda | System Architect | Truviso
1065 E. Hillsdale Blvd., Suite 215
Foster City, CA 94404
(650) 242-3500 Main
www.truviso.com
