On Wed, Aug 31, 2011 at 17:21, Colomban Wendling <lists....@herbesfolles.org> wrote: > Hey, > > Le 31/08/2011 00:01, Jiří Techet a écrit : >> On Mon, Aug 29, 2011 at 13:17, Thomas Martitz >> <thomas.mart...@student.htw-berlin.de> wrote: >>> Am 28.08.2011 23:33, schrieb Jiří Techet: >>>> >>>> On Sat, Aug 27, 2011 at 20:50, Frank Lanitz<fr...@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?
Yes, as I said earlier, this has to be adjusted manually by the grafts file. > > 2) I've got a full commiters list, hopefully OK (that's the only useful > part of this email actually...): > > colombanw = Colomban Wendling <b...@herbesfolles.org> > eht16 = Enrico Tröger <enrico.troe...@uvena.de> > (no author) = Enrico Tröger <enrico.troe...@uvena.de> > fralan = Frank Lanitz <fr...@frank.uvena.de> > frlan = Frank Lanitz <fr...@frank.uvena.de> > kretek = Frank Lanitz <fr...@frank.uvena.de> > ntrel = Nick Treleaven <nick.trelea...@btinternet.com> > dmaphy = Dominic Hopf <dma...@googlemail.com> > statc = Eugene Arshinov <earshi...@gmail.com> > elextr = Lex Trotman <ele...@gmail.com> > peterscholtens = Peter Scholtens <peter.scholt...@xs4all.nl> > clytie = Clytie Siddall <cly...@riverland.net.au> Great, good to know. > > 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) If I remember correctly, there should be tags as an output of svn2git. I'd just prefer getting rid of the created tag-branches by rebasing the rest of trunk on top of the tag-branches (for every tag). Cheers, Jiri _______________________________________________ Geany-devel mailing list Geany-devel@uvena.de https://lists.uvena.de/cgi-bin/mailman/listinfo/geany-devel