Re: Git conversion status update and request for preferred git ids

Hi Fabian,

I'm okay with the imperfect commit identification of git-cvsimport; in
my experience maintaining a perfect history of any software item over
time is an impossible task. My preferred git id would be:

diem = Ian Silvester <[email protected]>


Cheers,

Ian



On Fri, 1 Apr 2016, at 07:52, Fabian Keil wrote:
> I've been experimenting with two cvs-to-git converters,
> namely cvs2git 2.4.0 (http://cvs2svn.tigris.org/cvs2git.html)
> and git-cvsimport as shipped with git 2.7.4.
> 
> Issues so far:
> 
> 1)
>   cvs2git does not support the $Log$ keyword and replaces it with
>   "$Log: not supported by cvs2svn $". git-cvsimport supports it:
>   https://www.electrobsd.org/gitweb/?p=privoxy-cvsimport.git;a=blob;f=Makefile;h=ed6d7acb72ade5fbe3f21587c15a589ff3d6b1ff;hb=HEAD
> 
> 2)
>   Dates in $Id$ keyword are expanded differently:
> 
>   git-cvsimport:
>   "$Id: Makefile.in,v 1.1.1.1 2001/05/15 13:59:00 oes Exp $"
> 
>   cvs2git:
>   "$Id: Makefile.in,v 1.1.1.1 2001-05-15 13:59:00 oes Exp $"
> 
>   I prefer the latter, but don't consider this a big deal.
> 
> 3)
>   cvs2git creates an additional "v_3_1_archive_branch" branch while
>   git-cvsimport adds a "vendor" branch with different content.
>   https://www.electrobsd.org/gitweb/?p=privoxy-cvsimport.git;a=summary
>   https://www.electrobsd.org/gitweb/?p=cvs2git-privoxy.git;a=summary
> 
>   I find this somewhat interesting, but haven't looked into the
>   details and mainly care about the HEAD branch.
> 
> 4)
>   cvs2git creates annotated tags that contain bogus deletions
>   https://www.electrobsd.org/gitweb/?p=cvs2git-privoxy.git;a=commit;h=c3c8cec0b30c52f54980211d66ddf225d49ffe8a
>   In my opinion these are completely unacceptable.
> 
>   git-cvsimport uses plain tags that look good to me:
>   https://www.electrobsd.org/gitweb/?p=privoxy-cvsimport.git;a=commit;h=11957d8e03871ca7568ddd9197b4e8876d913ab8
> 
>   Tags from cvs2git can probably be corrected automatically
>   by moving each tag to the previous commit.
> 
> 5)
>   git-cvsimport incorrectly merges some commits:
>   https://www.electrobsd.org/gitweb/?p=privoxy-cvsimport.git;a=commitdiff;h=676f63a117b4a121b44f0049d557da8f346e33a5
>   
>   Is was hoping that -z 0 might help, but apparently it does not:
>   https://www.electrobsd.org/gitweb/?p=privoxy-cvsimport-z0.git;a=commitdiff;h=676f63a117b4a121b44f0049d557da8f346e33a5
>   The fact that the hash did not change implies that it has no
>   effect at all.
> 
>   With -z 1 the changes are separate:
>   https://www.electrobsd.org/gitweb/?p=privoxy-cvsimport-z1.git;a=commitdiff;h=9e67967b968679b21b1580774b1fdabe2eee2619
> 
>   It also causes some change sets with the same commit message to
>   get separated, though:
>   https://www.electrobsd.org/gitweb/?p=privoxy-cvsimport-z1.git;a=commit;h=f9ff0531d0316a860b76db2d7ad01ea2401fc1cd
>   https://www.electrobsd.org/gitweb/?p=privoxy-cvsimport-z1.git;a=commit;h=e3a6f863451b6d4ba7bce1f86e95ff433ff98391
> 
>   cvs2git seems to get it right by default (at least in these cases):
>   https://www.electrobsd.org/gitweb/?p=cvs2git-privoxy.git;a=commitdiff;h=4fb89055630906c0733bf35e2d40b9c34311ca05
>   https://www.electrobsd.org/gitweb/?p=cvs2git-privoxy.git;a=commit;h=e78c08afcd698b6fcf452380b5ecf94e76231aa0
> 
> Note that the URLs above are temporary. I intend to continue
> experimenting
> with various parameters (and maybe additional converters) and will
> eventually
> remove the repositories above.
> 
> Feel free to run your own conversion experiments and let me
> know if (and how) you get better results.
> 
> For the conversion tests above I only mapped my own SF name to a
> git id while the following additional SF names are found in the
> current repository:
> 
> agotneja
> david__schmidt
> dessent
> diem
> etresoft
> gjmurphy
> gliptak
> hal9
> haroon
> iwanttokeepanon
> joergs
> jongfoster
> ler762
> mal0rd
> markm68k
> morcego
> oes
> proactivesvcs
> roro
> sarantis
> steudten
> swa
> 
> If yours is among them, please let me know what your git id
> should look like. git-cvsimport uses a format like this:
> 
> fabiankeil = Fabian Keil <[email protected]>
> 
> If you are concerned about spam, you could use a fancy @privoxy.org
> address that could forward to another address (after being set up),
> or simply bounce (no setup required).
> 
> Before the final conversion I'll try to get the preferred git
> ids for all the remaining SF names, but suspect that some
> of the developers will be unreachable.
> 
> Fabian
> ------------------------------------------------------------------------------
> Transform Data into Opportunity.
> Accelerate data analysis in your applications with
> Intel Data Analytics Acceleration Library.
> Click to learn more.
> http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140
> _______________________________________________
> Ijbswa-developers mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/ijbswa-developers
> Email had 1 attachment:
> + Attachment1.2
>   1k (application/pgp-signature)

------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140