Re: Git conversion status update and request for preferred git ids
Fabian Keil <[email protected]> Tue, 5 Apr 2016 19:05:05 +0200
| Newsgroups | gmane.comp.web.privoxy.devel |
|---|---|
| Message-ID | <[email protected]> |
--===============8036373425405280964== Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/OjfsyAn+kqmuUHQU03AY6HB"; protocol="application/pgp-signature" --Sig_/OjfsyAn+kqmuUHQU03AY6HB Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Fabian Keil <[email protected]> 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. I'm reasonably happy with the scripted conversion with a patched cvs-fast-export: https://www.electrobsd.org/gitweb/?p=3Dprivoxy.git;a=3Dsummary The conversion happened with an authormap that additionally includes the preferred git ids for David and Ian Thanks for the feedback so far. > 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=3Dprivoxy-cvsimport.git;a=3Dsummary > https://www.electrobsd.org/gitweb/?p=3Dcvs2git-privoxy.git;a=3Dsummary >=20 > I find this somewhat interesting, but haven't looked into the > details and mainly care about the HEAD branch. After looking into it a bit, I think we only need the master branch and thus the conversion script converts all the other branches into tags or removes them if they are duplicates. > 4) > cvs2git creates annotated tags that contain bogus deletions > https://www.electrobsd.org/gitweb/?p=3Dcvs2git-privoxy.git;a=3Dcommit;h= =3Dc3c8cec0b30c52f54980211d66ddf225d49ffe8a > In my opinion these are completely unacceptable. >=20 > git-cvsimport uses plain tags that look good to me: > https://www.electrobsd.org/gitweb/?p=3Dprivoxy-cvsimport.git;a=3Dcommit= ;h=3D11957d8e03871ca7568ddd9197b4e8876d913ab8 >=20 > Tags from cvs2git can probably be corrected automatically > by moving each tag to the previous commit. As it turns out, cvs2git is right about including these strange deletions and git-cvsimport gets it wrong. They deletions are the result of incomplete tag coverage in CVS. cvs-fast-export uses branches for these tags, but I convert them into tags again. > Feel free to run your own conversion experiments and let me > know if (and how) you get better results. My impression is that the technical issues I brought up are solved in the latest conversion. > 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: The current list of untranslated ids: agotneja dessent 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: >=20 > fabiankeil =3D Fabian Keil <[email protected]> >=20 > 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). >=20 > 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. I'll try to contact the missing authors via private mail in the next days so they'll have a couple of weeks to respond before the final conversion which hopefully will happen before the end of next month. Fabian --Sig_/OjfsyAn+kqmuUHQU03AY6HB Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXA/BBAAoJEGkYIpGLojcc5pMP/2rh+0GMJaVQ/bwMDcF0WDj4 JTj4dMph8xxD2V2+jWJscNEjYCzw1uvdYCf9kkqgKdkHZFOFNvZ5YLlNdYg0lG/1 6PL42ANtWv4IlK2r1up6dunwnlmm/rXIY8WQWjgGLLF1bD2I4xgq4mU0ocyxMAwb 9UgUXVcm92/bFugcg04KmI/zg6DjuFG4Nf+XPx4ymqSZG5VmxoFi4oB2quT51yj7 FJgPBjStHrVkIzdb2PHXPXTUIXgnVYDNOEevsUBmqJIFOrVtOSeiEf2g7bFUt4As RA5FcVTwJZgH7hkL6EO3Es4k1gDKcDOwnzpbb0MuK+v31mMMM62VVL3dfWDFdtmE O1In3gaAhr38QChoSElMoug32unE/34+hucZiFpUcEcmuoddE2Q3qyqGnXwSmEPO N+tlJXtZBGvSADKfxjAPIsxDFPyo0e/el3c9o69uVuy8QdnAGISxVFnUj4mD7Auk fciHE0J1RGq7pjzEZXeEsW8ibvnta7mu3xQP0WQaLtafM6ZeNOw/6LN6t7YVm6B9 nolxTXylLciywg68AU0Tk9Uzi5I6xGuFcaxufGJd3sEwpOydkSk4PFTKGFJF75G2 7miNN2fFgEE8WHmQag+haQgrP22Mgbfuq0CIIAQFkHbbk76SCJh8ELHibiBHtfTX XDmZw6YsaXjFvjZHnlPX =bzaD -----END PGP SIGNATURE----- --Sig_/OjfsyAn+kqmuUHQU03AY6HB-- --===============8036373425405280964== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------------ --===============8036373425405280964== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Ijbswa-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ijbswa-developers --===============8036373425405280964==--