Hey,
Le 31/08/2011 00:01, Jiří Techet a écrit :
On Mon, Aug 29, 2011 at 13:17, Thomas Martitz thomas.martitz@student.htw-berlin.de wrote:
Am 28.08.2011 23:33, schrieb Jiří Techet:
On Sat, Aug 27, 2011 at 20:50, Frank Lanitzfrank@frank.uvena.de wrote:
So I suggest this: Jiri can you help to do so (or does maybe the github svn clone tools does this correct?) we surely can also offer something like that from git.geany.org. But here import is needed FMPOV.
I could, but it needs some manual work and I'd like to do it just before the switch because I'm not sure if I could easily add the commits (commits on different branches and especially merges) you do between now and the switch. I was too missing a few committer names - see the original email here
http://lists.uvena.de/geany-devel/2010-June/002672.html
which I'd need to get first before performing the conversion.
I could also ask the one that successfully converted our Rockbox svn repo to git, including proper branch, tag and author conversion, to write up the steps it needed. I think it was less than a day of work for him (and the Rockbox tree and history is considerably larger and more complicated than Geany's).
I expect the whole conversion of Geany's vcs wouldn't take more than 4 hours. I believe I know enough to perform the complete conversion myself but of course it would be useful to know someone else's experience.
FWIW, I've played a little with git-svn, and I've got a few things working/non-working:
1) as expected, it doesn't make merges looks like merges, but as a single commit. However Thomas said on IRC that SVN didn't knew merges either, maybe it makes this impossible to track then?
2) I've got a full commiters list, hopefully OK (that's the only useful part of this email actually...):
colombanw = Colomban Wendling ban@herbesfolles.org eht16 = Enrico Tröger enrico.troeger@uvena.de (no author) = Enrico Tröger enrico.troeger@uvena.de fralan = Frank Lanitz frank@frank.uvena.de frlan = Frank Lanitz frank@frank.uvena.de kretek = Frank Lanitz frank@frank.uvena.de ntrel = Nick Treleaven nick.treleaven@btinternet.com dmaphy = Dominic Hopf dmaphy@googlemail.com statc = Eugene Arshinov earshinov@gmail.com elextr = Lex Trotman elextr@gmail.com peterscholtens = Peter Scholtens peter.scholtens@xs4all.nl clytie = Clytie Siddall clytie@riverland.net.au
Frank especially, can you confirm your 3 nicks? (although I've based the matches on SF + commits)
3) We won't probably be able to create Git tags from the SVN tags because they (at least Geany-0_18 do) don't all tag a single commit (e.g. it's a branch)
I also played with svn-all-fast-export (looks like it is svn2git), and:
1) it created a 406M (!!) export, for a 38M for git-svn
2) it seems to eat some merged branches (adds a bakcup/name@rev tags)
3) although it creates some merges, some others are still missing
4) it creates tags (although I'm not certain they all are OK, but probably)
I've uploaded my git-svn result on SF [1] if anyone want to look at it for whatever reason.
Cheers, Colomban