[Scummvm-devel] scummvm-tools git repository -- alpha release

Ori Avtalion ori at avtalion.name
Sat Jan 1 21:05:12 CET 2011


Hey,

Good news, everyone! (and a happy new year!)

I made an attempt at converting the scummvm-tools repository to git:

https://github.com/salty-horse/scummvm-tools

There are a few things left to iron out, which I detail below.

The repository was created by using git-svn to fetch the data, and I 
then converted all of the created branch/tags to proper git branches and 
tags.

Branches that were merged to trunk were removed. I don't think there's a 
need to keep them. "git log --merges" can find them easily.

Branches that contained no code changes were removed. Those are usually 
release branches. Annotated tags were created at those points instead of 
the old tags.

Points to consider:

1) Author emails.

There have been 35 committers to the repository, listed at the bottom of 
the email. They should be converted to name+email. A list has been 
created before:

http://permalink.gmane.org/gmane.games.devel.scummvm/7939

Should I use that one? Or should we created some private editable 
document for people would be able to choose their own identifiers?
Is it possible to do on the wiki?

2) I removed some mis-taggings and such, but I did not remove all of the 
empty commits that change svn properties. Should they be removed? If the 
svn repository is still around as read-only, I see no reason to.

3) In svn, all of the v0.3.0 to v0.6.1 tags were committed to a long 
time after release, and those commits only include trivial changes to 
things like cvs keywords. Should I discard those and tag at the correct 
place?

4) There are several "live" branches that have never been merged. Should 
I tag them and remove the branches? If they are stale, there's no reason 
to keep the branch around. Does it matter?

The branches are:

   gsoc2007-decompiler
   gsoc2007-toolsgui
   gsoc2009-decompiler

5) Should the git-svn-id strings be rewritten to something shorter?

6) The v1.1.0 tag has a bad commit that I want to remove:
https://github.com/salty-horse/scummvm-tools/commit/a053f2ff92301a983469b1d1ef133c17f2297d5c

My attempt doesn't really work: http://pastebin.com/Q8LxZZzX
If anyone knows a solution, chime in :)

7) I'm still going to make a few rewrites to that repository, dealing 
with the above issues, so don't expect future pulls to work :)

-Ori

Committer usernames:

aquadran
athrxx
bbrox
buddha_
criezy
cyx
drmccoy
ender
eriktorbjorn
fingolfin
h00ligan
Hkz
jamieson630
joostp
jvprat
khalek
kirben
knakos
lavosspawn
lordhoto
m_kiewitz
mthreepwood
mutle
olki
peres001
pidgeot
Remere
salty-horse
sev
spookypeanut
strangerke
tdhs
thebluegr
vinterstum
wjpalenstijn




More information about the Scummvm-devel mailing list