[Scummvm-devel] git repository conversion

Willem Jan Palenstijn wjp at usecode.org
Mon Jan 24 20:43:10 CET 2011


Hi,

I've done some more work on converting scummvm's main repository to git:

https://github.com/wjp/scummvm-2010-archive

It starts at the end of what I previously did (at
https://github.com/wjp/scummvm-archive ), and continues to the end of 2010. The
remaining (410!) commits in 2011 are very straightforward to add, but this way
it's less of a moving target.

This time I scripted the entire process. The relevant bits are in
http://www.usecode.org/scummvm/svn2git/ , but putting everything together takes
some manual work, since I've used a patched git-filter-branch to maintain a map
of svn revision to git revision. Some of the filter-branch runs take quite
some time to complete, so I also haven't tested if it actually runs as-is.


Done:
* convert all svnmerge/manual merges into git merges (I hope I didn't miss any)
* fix up commits (r50329, r54051) where CRLFs were added to entire files
* change the author and date of SWORD25 merge commits to those in
  the original SWORD25 svn repository. (I kept the committer as-is.)
* fix up any mentions of sha1 hashes in commit messages (r53296, r54624)


To do:
* convert usernames into real names and email addresses
* clean up the git-svn-id lines in the commit messages
* combine this with the older repo and add commits from 2011


Regarding external histories (such as FreeSCI's): my current opinion is that
it's probably best to keep that outside of our main git repository. Developers
who need it can easily use a graft (in .git/info/grafts) to add any external
history to their local git repository. That way we also don't have to decide
right now keeping which histories is worthwhile.


Please have a look and see if there's anything else that should be done.



-Willem Jan




More information about the Scummvm-devel mailing list