[prev in list] [next in list] [prev in thread] [next in thread] 

List:       amanda-hackers
Subject:    git-svn sync error
From:       "Dustin J. Mitchell" <dustin () v ! igoro ! us>
Date:       2011-06-01 19:27:06
Message-ID: BANLkTinyykG+Bo6=3Ab-QH-=N7zEHv863g () mail ! gmail ! com
[Download RAW message or body]

So, it looks like someone added
 fgaliegue = = Francis Galiegue <fgaliegue@gmail.com>
to the git-authors file, because all of the commits ported to github
are coming out with an extra "=" in them:
 Author: = Francis Galiegue <fgaliegue@gmail.com>

That means that all of the developers using git (which, incidentally,
is all of us...) now have two separate git lineages - one with the
correct name, and one (on github) with the incorrect name.

I don't know what the best way to fix this is.  Well, I do - leave svn
behind and use git!  But aside from that option, which has massive
inertial holding it back, the best I have is:

* revert the source repository that buildbot uses to push to github to
before the first bogus commit -- this is tricky with git-svn, although
I have a blog entry from last time I had to do it:
http://code.v.igoro.us/archives/20-roll-back-a-git-svn-mirror.html

* fix the git-authors file

* run 'git svn fetch --all'

* re-push to github

Dan, can you give it a try?

Dustin
[prev in list] [next in list] [prev in thread] [next in thread]