Re: test git conversion

From: Marko Kreen <markokr(at)gmail(dot)com>
To: Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us>
Cc: pgsql-jdbc(at)postgresql(dot)org
Subject: Re: test git conversion
Date: 2011-10-05 15:15:32
Message-ID: CACMqXCLk97L-x6r7zCd2VaE9sJM=e5o+Ov2pQVKmhAox1-_P+A@mail.gmail.com
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-jdbc

On Wed, Oct 5, 2011 at 4:58 PM, Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> wrote:
> Marko Kreen <markokr(at)gmail(dot)com> writes:
>> - There are few manufactured commits on branches (not on HEAD):
>
>> $ grep -i cvs2 cvs2svn-tmp/git-dump.dat
>> This commit was manufactured by cvs2git to create branch 'REL6_4'.
>> ...
>
>> So the question is does the code look sane around those points
>> and do we need to do something with it.  As cvs2git has seen improvements
>> since postgres conversion, perhaps they are ok and we can ignore those.
>> Especially since they are only on older branches.
>
> I don't have details in my head anymore, but when we did the server's
> git conversion, every one of those "manufactured commits" was a real
> problem, ie, it didn't represent the history in a nice way.  I think the
> most common cause was adding a file on HEAD and then on a pre-existing
> branch, and that the unmodified git conversion then misrepresented the
> state of the file at earlier instants in that branch (ie, it was there
> when it should not be).  This is a bug/ambiguity in the CVS
> representation, there is nothing cvs2git can do about it.  We worked
> around it in the server conversion by editing the RCS files ... don't
> know whether you guys are feeling sufficiently anal to do likewise.

I actually got interfaces/jdbc parts from Magnus' repository_fixups
working against jdbc repo. Attached script gets rid of two REL7_1 tag
related commits.

But looking at the script it indeed is not about "representing cvs
history in git"
but "working around bad history in cvs". And it does not affect main branch
history in any way.

So it's dubious whether it's worthwhile to do it, and in any case I'm
wrong person to do it, as I'm completely unfamiliar with JDBC
code, both old and new...

--
marko

Attachment Content-Type Size
repository_fixups application/octet-stream 8.2 KB

In response to

Responses

Browse pgsql-jdbc by date

  From Date Subject
Next Message Marko Kreen 2011-10-05 16:03:15 Re: test git conversion
Previous Message Tom Lane 2011-10-05 14:58:58 Re: test git conversion