Re: cvsimport bug on branches [was: conversion to git]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Eric Blake on 9/20/2007 7:17 PM:
>> http://git.savannah.gnu.org/gitweb/?p=m4.git
> 
> Unfortunately, after publishing this repository, I noticed that there is a
> bug in git-cvsimport, when a vendor branch is created that contains fewer
> files than the point it branched from.  Those files were not removed from
> the commit on the new branch, which means the git repository contains too
> many files compared to what the CVS repository had for any checkout along
> the branch.

Using git rebase (and a lot of patience with the earlier commits, where
there were more conflicts due to the poor commit history chosen by
cvsps/git-cvsimport; the conflicts lessened in later commits, as the CVS
history touched more files), I repaired the damage.  However, in doing so,
I had to force the revision of existing published tags.  This means that
anyone who has already pulled the m4.git repository now has outdated tags;
the best way to repair this is to delete the tags from your repository,
then do a fresh git pull to pick up the updated tags under the same name
but different reference (perhaps followed by a git-gc, since it abandons a
lot of commit objects).  If you are looking at the repaired tree, you will
see the following:

$ git rev-parse m4-1.4{,.1,.2} release-1.4.{3,4,4b,5,6,7,8,8b,9,9b,10}
f82834e3653b3eefd645a409f18cd38dbcbad1c2
93ad4c046fe5cf126950258da9d99cc9767c7859
caae298c064a204d92bd88efa55a80575be25430
70b4623271f426c06735dfe2a0127e52a7b02cc6
8bb6120ee3b28437fee42ac2a87c578fe1288c24
6df56acfbb822554f85fb0cdc73be9ced1a635f8
42c9c39898cb629240f8d5cd76612e61ecc819a2
b7de5920f141604b1cccf376bbc238a6542994ee
25fde5b6c53074e6f6e4da087bb187cc3e5db47c
0a0410cbdf7fa720130b61d408808a25022ebd14
1b6874bb28b01f4a0098c78c4ef29029dd8853f1
a9ed2ee1c3c3f0a07e335908e6a98420165d1e89
d54524a7c11130515a98d581867ad6a399bb475d
f911c60a979b6b10e1bcd3c71716d29921aec8c1

- --
Don't work too hard, make some time for fun as well!

Eric Blake             [email protected]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFG9EJa84KuGfSFAYARAp+uAJ94YMnN9POL2cwd79c9a908XVl6TgCgsplV
8e529K1tm7pAuPwRDLJ8qvA=
=k/FA
-----END PGP SIGNATURE-----