Horton

Re: Report: removing the inconsistencies in our CVS->git conversion

Tom Lane <tgl@sss.pgh.pa.us>

View thread
From: Tom Lane <tgl@sss.pgh.pa.us>
To: Robert Haas <robertmhaas@gmail.com>
Cc: pgsql-hackers@postgresql.org, Michael Haggerty <mhagger@alum.mit.edu>, Max Bowsher <maxb@f2s.com>
Date: 2010-09-13T15:48:22Z
Lists: pgsql-hackers

Commits

Same data as JSON: GET /api/v1/messages/:b64id/commits the thread's linked commits as JSON, with link sources. API reference →

  1. Applied patch to jdbc from Kim Ho at RedHat, fixing improper handling of empty queries under the V3 protocol

  2. Applied patch for jdbc from Kim Ho at RedHat to more correctly deal with boolean values

  3. Applied patch from Oliver Jowett to improve a buffer sizing.

  4. Code cleanup inspired by recent resname bug report (doesn't fix the bug

  5. Pass shared memory id and socket descriptor number on command line for

  6. Second try at avoiding conflicts with system isblank().

  7. Applied Kris Jurkas patch to fix rollback and SQLException

  8. applied patch from Oliver Jowett

  9. Make the world at least somewhat safe for zero-column tables, and

  10. Add mention of -F not supported by pg_dumpall. Code already disallows it.

  11. Two versions of QueryExecutor, currently only version 2 works 100%

  12. modifications to the way the protocol is handled to be consistent with

  13. Part of Anders Bengtsson's patch to clean up Connection.java

  14. Applied Anders patch to move the startup code out of Connection into StartupPacket

  15. >Added ServerEncoding

  16. > I am backing out this patch. Please resubmit with this corrected. Thanks.

  17. Fixes bug where query hangs if there is an error in the query, went back to

  18. Backpatch array I/O code and documentation fixes, also array slice

  19. fixed QueryExecuter to deal with multiple errors

  20. Repair bad calculation in timetz_izone() which gave erroneous results.

  21. backed out changes for cancel, no need to look for two 'Z' responses

  22. Patch by Nicolas Verger to correctly propogate SQLWarning to the Statement and ResultSet

  23. fixed cancel query bug introduced by patch

  24. Autoconf for jdbc debug changes.

  25. Updated the list of encodings supported to match what the backend now supports

  26. Added some additional comments in the code

  27. Update TODO list.

  28. Remove ConnectionHook.java. No longer used, bad code.

  29. The attached patch removes some old and dead code (and some related

  30. First batch of the tools merged in...

  31. This patch fixes an arrayindexoutofbounds exception that was just

  32. Add ./include/config.h.win32 to RELEASE update list.

Robert Haas <robertmhaas@gmail.com> writes:
> On Sun, Sep 12, 2010 at 11:03 PM, Tom Lane <tgl@sss.pgh.pa.us> wrote:
>> Having completed that comparison, I then moved on to trying to get rid of
>> the discrepancies in the git conversion; particularly, trying to get rid
>> of the "manufactured commits". I didn't have much success in that for the
>> cases where the manufactured commit was caused by a back-branch file
>> addition. [...] We still have "manufactured" commits either
>> way, but they are just cosmetic so I guess we should live with them.

> I'm not really following what the history looks like here.  What are
> the contents (git show) of the manufactured commit?

A typical example is

commit 4d2ac8075a93c685dbbe920f4bac23288dd7cf11
Author: PostgreSQL Daemon <webmaster@postgresql.org>
Date:   Tue Nov 22 18:17:36 2005 +0000

    This commit was manufactured by cvs2svn to create branch 'REL7_4_STABLE'.
    
    Cherrypick from master 2005-11-22 18:17:34 UTC Bruce Momjian <bruce@momjian.us> 'Re-run pgindent, fixing a problem where comment lines after a blank':
        src/port/unsetenv.c

diff --git a/src/port/unsetenv.c b/src/port/unsetenv.c
new file mode 100644
index 0000000..bdfb3f6
--- /dev/null
+++ b/src/port/unsetenv.c
@@ -0,0 +1,56 @@
+ [ entire contents of unsetenv.c here ]

In the cases where I inserted a dead .0 revision, this is followed by
something like

commit a1bdd263ca8ff657365a97a560f6371f39295efc
Author: Bruce Momjian <bruce@momjian.us>
Date:   Tue Nov 22 18:17:37 2005 +0000

    Mark branch as deleted.

diff --git a/src/port/unsetenv.c b/src/port/unsetenv.c
deleted file mode 100644
index bdfb3f6..0000000
--- a/src/port/unsetenv.c
+++ /dev/null
@@ -1,56 +0,0 @@
- [ entire contents of unsetenv.c here too ]

I'm a bit disappointed by the fact that we get either of these.  I had
gathered from Max's comments that the dead-revision-at-the-base-of-the-
branch trick is considered standard in newer CVS versions, and so I'd
hoped that cvs2git would understand the construct and not generate
either of these commits.  Possibly the hacked-up revisions I inserted
are enough different from the regular kind to confuse it.

>> I also found numerous places where we'd been sloppy about placing tags.

> I wonder if we should consider fixing some or all of these things on
> the master CVS repository.  I wouldn't be too eager to inject those
> fake .0 commits for fear of breakage, but moving tags to where they
> ought to have been all along seems like it might be a good thing to do
> independent of git.

Yeah, that's something I was wondering too.  Applying these fixes to the
master repository would also reduce the number of things we have to
remember to do during the final conversion.  OTOH, there's that risk of
breaking something.

			regards, tom lane