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

Magnus Hagander <magnus@hagander.net>

From: Magnus Hagander <magnus@hagander.net>
To: Tom Lane <tgl@sss.pgh.pa.us>
Cc: Robert Haas <robertmhaas@gmail.com>, pgsql-hackers <pgsql-hackers@postgresql.org>
Date: 2010-09-17T21:34:28Z
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.

On Fri, Sep 17, 2010 at 23:01, Tom Lane <tgl@sss.pgh.pa.us> wrote:
> BTW, on the cleanup steps:
>
> # Remove bogus branches
> git branch -D unlabeled-1.44.2
> git branch -D unlabeled-1.51.2
> git branch -D unlabeled-1.59.2
> git branch -D unlabeled-1.87.2
> git branch -D unlabeled-1.90.2
>
> You should not need any of the above; I don't see those being generated
> anymore with the cleanup script in place.

I see them - at least the script didn't give an error when it ran, but
said it had deleted them.

> git branch -D ecpg_big_bison
>
> I don't agree with removing this.  It is a legitimate part of the
> project history.  Yeah, it was a workaround, but we've had workarounds
> in place for other broken software.

Ok. I was just going by Michaels email - I'll leave it in then.


> # Remove broken tags
> git tag -d SUPPORT
> git tag -d MANUAL_1_0
> git tag -d Release-1-6-0
>
> Also get rid of the "creation" tag, please.  Also, just for the record,
> these aren't really broken.  Maybe "Remove unwanted partial tags"?

Right. I didn't really pay much attention to the comments, since it's
just a temporary thing.
"creation" added to the list.


> In addition to the above, we're going to want to clean up the
> Release_2_0_0 and Release_2_0 tags, but I'm not sure if there's
> a reasonable way to script those when the commit SHA1's aren't frozen
> yet.  I can give you timestamps for the commits they should point at,
> but I lack the git-fu to convert that into a git tag command.

yeah, that's definitely easier to do after the fact.


> Similarly, we're going to want to repoint REL6_5, REL7_1, REL7_1_2
> tags at more appropriate places, but right now all I have for those is
> timestamps.  (I've also identified places to tag the other early
> releases, but those tags can certainly be added later.)

I like your downthread suggestion of removing them, and then putting
them back in manually later. I'll add them all to the delete list.

-- 
 Magnus Hagander
 Me: http://www.hagander.net/
 Work: http://www.redpill-linpro.com/