git history revision

[Eric Blake]

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

Sorry I didn't notice this earlier, but when trying to push a recent
commit from git back to CVS[1], I discovered that the initial
git-cvsimport had screwed up the history of the mainline.  Files that were
touched on the branch but not the head were incorrectly listed in the git
tree for the head, causing every single point of history in the previous
refs/heads/master to differ from what CVS claimed.

I have since gone back and fixed everything with a series of git-rebase,
but it means that if you have a git repository checked out before now, it
has stale data; similar to the state of things with the branch-1_4 branch
last month[2].

[1] http://git.sv.gnu.org/gitweb/?p=m4.git;a=commit;h=54c0ec6
[2] http://lists.gnu.org/archive/html/m4-patches/2007-09/msg00027.html

To fix your local repository, run the following:

$ git tag -d m4-1.4{c,d,e,f,h,i,j,k,l,m,n,o,ppre2}
$ git pull

Then to double-check things, you should see:

$ git rev-parse m4-1.4{c,d,e,f,h,i,j,k,l,m,n,o,ppre2}
b1dc6530fba203872ce2d5486d9bb8ef5dcd2530
4f3f490f8aa9c47dfe874dd156445ac05786fb44
ccc53c7089eed5d7bed91f4da57d062b6064f578
cadf688c09928f593ce0bfa93c15afd7226c26ec
f2efdfa6a528ab1cbc6bb891ba5b01eb460bcd77
83df9fcd10147d8a3283845f324987574a015bd3
1e7c0dc6854ce0d5c9d53b3ed7c45d1e059351e3
1a7d2d7e8eef1bbea46f9d303667d0047ace69b9
24fc956437e057bd446aed93f2403115b726e598
ee1aa6c825458998a116b92d50763dbfee165a83
2a43c62450a3d8ba46fc269b79d9139f90d4a199
9a929c868ac6fbc6afa159b42096248f25de38b5
d053c60dd972019fb17c2af796aff42451bfceb8

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

Eric Blake             address@hidden
-----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

iD8DBQFHCAhz84KuGfSFAYARAiFEAKDSOeoZne8a42Bqjiaggy8N2Mgd3ACgzRoW
Nm2AdHuANPG1CprR8jTKxT8=
=FxAx
-----END PGP SIGNATURE-----