{"thread":{"id":"1592","subject":"SVN import","startedAt":"2005-08-19T10:00:51Z","lastAt":"2005-10-16T18:09:42Z","messageCount":19,"participants":["Matthias Urlichs","Elfyn McBratney","Yasushi SHOJI","Kalle Valo","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"7560","messageId":"pan.2005.08.19.10.00.49.401829@smurf.noris.de","threadId":"1592","inReplyTo":null,"subject":"SVN import","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-08-19T10:00:51Z","receivedAt":"2005-08-19T10:00:51Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Quick note: I'm working on importing from SVN.\n\nMy current main problem is that SVN's Perl interface leaks server\nconnections (apparently nobody has used it for any real work yet),\nwhich is of course *bad*, and kindof prevents me from finishing\nthe job today. :-/\n\n-- \nMatthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\nI could certainly run a marvellous university here if only we didn't\nhave to have all these damn students underfoot all the time.\n\t\t-- Terry Pratchett (Hogfather)\n"},{"id":"9876","messageId":"pan.2005.10.10.09.45.00.468989@smurf.noris.de","threadId":"1592","inReplyTo":"pan.2005.08.19.10.00.49.401829@smurf.noris.de","subject":"Re: SVN import","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-10-10T09:45:05Z","receivedAt":"2005-10-10T09:45:05Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi, Matthias Urlichs wrote:\n\n> Quick note: I'm working on importing from SVN.\n\nThe first version seems to be finished.\n\nhttp:/netz/smurf.noris.de/git/git.git, branch \"svn\".\n\nShould be ready for merging, though I wouldn't say no to a few testers\nbefore that happens.  ;-)\n\n-- \nMatthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de\n"},{"id":"9877","messageId":"20051010102651.GA30202@gentoo.org","threadId":"1592","inReplyTo":"pan.2005.10.10.09.45.00.468989@smurf.noris.de","subject":"Re: SVN import","fromName":"Elfyn McBratney","fromEmail":"beu@gentoo.org","sentAt":"2005-10-10T10:26:51Z","receivedAt":"2005-10-10T10:26:51Z","isPatch":false,"sender":{"key":"beu@gentoo.org","avatar":null},"body":"On Mon, Oct 10, 2005 at 11:45:05 +0200, Matthias Urlichs wrote:\n > Hi, Matthias Urlichs wrote:\n > \n > > Quick note: I'm working on importing from SVN.\n > \n > The first version seems to be finished.\n > \n > http:/netz/smurf.noris.de/git/git.git, branch \"svn\".\n > \n > Should be ready for merging, though I wouldn't say no to a few testers\n > before that happens.  ;-)\n\nAh cool, was going to work on an SVN counterpart to git-{arch,cvs}import,\nbut now won't have to. ;)  Will test and report back. :)\n\nBest,\nElfyn\n\n-- \nElfyn McBratney\nGentoo Developer/Perl Team Lead\nbeu/irc.freenode.net                            http://dev.gentoo.org/~beu/\n+------------O.o--------------------- http://dev.gentoo.org/~beu/pubkey.asc\n\nPGP Key ID: 0x69DF17AD\nPGP Key Fingerprint:\n  DBD3 B756 ED58 B1B4 47B9  B3BD 8D41 E597 69DF 17AD\n"},{"id":"9879","messageId":"20051010110405.GK567@kiste.smurf.noris.de","threadId":"1592","inReplyTo":"20051010102651.GA30202@gentoo.org","subject":"Re: SVN import","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-10-10T11:04:06Z","receivedAt":"2005-10-10T11:04:06Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi,\n\nElfyn McBratney:\n> Ah cool, was going to work on an SVN counterpart to git-{arch,cvs}import,\n> but now won't have to. ;)  Will test and report back. :)\n> \nPlease do. I've just pushed a few fixes.\n\n-- \nMatthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\nWhen competing for a section of road or a parking space, remember\nthat the vehicle in need of the most body work has the right-of-way.\n\t\t-- Massachusetts Driver Education Manual\n"},{"id":"9880","messageId":"20051010111428.GC30202@gentoo.org","threadId":"1592","inReplyTo":"20051010102651.GA30202@gentoo.org","subject":"Re: SVN import","fromName":"Elfyn McBratney","fromEmail":"beu@gentoo.org","sentAt":"2005-10-10T11:14:28Z","receivedAt":"2005-10-10T11:14:28Z","isPatch":false,"sender":{"key":"beu@gentoo.org","avatar":null},"body":"On Mon, Oct 10, 2005 at 11:26:51AM +0100, Elfyn McBratney wrote:\n > On Mon, Oct 10, 2005 at 11:45:05 +0200, Matthias Urlichs wrote:\n >  > Hi, Matthias Urlichs wrote:\n >  > \n >  > > Quick note: I'm working on importing from SVN.\n >  > \n >  > The first version seems to be finished.\n >  > \n >  > http:/netz/smurf.noris.de/git/git.git, branch \"svn\".\n >  > \n >  > Should be ready for merging, though I wouldn't say no to a few testers\n >  > before that happens.  ;-)\n > \n > Ah cool, was going to work on an SVN counterpart to git-{arch,cvs}import,\n > but now won't have to. ;)  Will test and report back. :)\n\nWorth noting that the URL is actually:\nhttp://netz.smurf.noris.de/git/git.git ;)\n\nBest,\nElfyn\n\n-- \nElfyn McBratney\nGentoo Developer/Perl Team Lead\nbeu/irc.freenode.net                            http://dev.gentoo.org/~beu/\n+------------O.o--------------------- http://dev.gentoo.org/~beu/pubkey.asc\n\nPGP Key ID: 0x69DF17AD\nPGP Key Fingerprint:\n  DBD3 B756 ED58 B1B4 47B9  B3BD 8D41 E597 69DF 17AD\n"},{"id":"9881","messageId":"20051010113933.GL567@kiste.smurf.noris.de","threadId":"1592","inReplyTo":"20051010111428.GC30202@gentoo.org","subject":"Re: SVN import","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-10-10T11:39:33Z","receivedAt":"2005-10-10T11:39:33Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi,\n\nElfyn McBratney:\n> Worth noting that the URL is actually:\n> http://netz.smurf.noris.de/git/git.git ;)\n> \n*Grumble*\n\nNB: Worth noting: the importer actually *requires* a current Perl SVN\nmodule (i.e., 1.2.1). Debian Sarge's version 1.1.4 doesn't work.\n\n-- \nMatthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\nThe best way to get rid of worries is to let them die of neglect.\n"},{"id":"9882","messageId":"pan.2005.10.10.13.32.46.778506@smurf.noris.de","threadId":"1592","inReplyTo":"20051010113933.GL567@kiste.smurf.noris.de","subject":"Re: SVN import","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-10-10T13:32:49Z","receivedAt":"2005-10-10T13:32:49Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi, Matthias Urlichs wrote:\n\n> Hi,\n> \n> Elfyn McBratney:\n>> Worth noting that the URL is actually:\n>> http://netz.smurf.noris.de/git/git.git ;)\n\nThe current version seems to actually work with nontrivial repositories\n(I'm importing gnupg at the moment, which recently switched from CVS to\nSVN).\n\nAlso worth noting is that cvs->svn->git is somewhat more faithful WRT\nimporting CVS archives with \"incomplete\" or \"funky\" tags -- it exports\ntheir state correctly to SVN, and my importer should be able to get them\nout again. On the minus side, the two cannot generate the same changesets\nbecause cvs2svn rounds timestamps to the next full minute.\n\nSpeed: Comparable to the CVS importer when crossing the network: both need\none roundtrip per file. I haven't done any tests with local repositories.\n\n-- \nMatthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\nEach morning puts a man on trial and each evening passes judgment.\n\t\t\t\t\t-- Roy L. Smith\n"},{"id":"9893","messageId":"8764s51cvp.wl@mail2.atmark-techno.com","threadId":"1592","inReplyTo":"pan.2005.10.10.09.45.00.468989@smurf.noris.de","subject":"Re: SVN import","fromName":"Yasushi SHOJI","fromEmail":"yashi@atmark-techno.com","sentAt":"2005-10-10T17:48:58Z","receivedAt":"2005-10-10T17:48:58Z","isPatch":false,"sender":{"key":"yashi@atmark-techno.com","avatar":"https://gravatar.com/avatar/4817e8703ac4379935834d87453faa9d0c94b9dc19d83fcc54c67875eb133e59?d=mp&s=160"},"body":"Hi Matthias,\n\nGreat work!\n\nAt Mon, 10 Oct 2005 11:45:05 +0200,\nMatthias Urlichs wrote:\n> \n> > Quick note: I'm working on importing from SVN.\n> \n> The first version seems to be finished.\n\njust tried on my svn repo, which had flat directory but moved to trunk\ndir after.  on that repo, the-current-just-pulled git-svnimport says:\n\n    1: Unrecognized path: /main.c\n\nto reproduce:\n\n    svnadmin create --fs-type fsfs /tmp/repo\n    svn co file:///tmp/repo test\n    cd test\n    touch main.c\n    svn add main.c\n    svn ci main.c -m 'testing svnimport'\n    svn mkdir trunk\n    svn move main.c trunk\n    svn ci -m 'move main.c to trunk/'\n    cd ..\n    git-svnimport.perl -C /tmp/test.git -i -v file:///tmp/repo/\n\nhope this helps,\n--\n          yashi\n"},{"id":"9895","messageId":"20051010181329.GQ567@kiste.smurf.noris.de","threadId":"1592","inReplyTo":"8764s51cvp.wl@mail2.atmark-techno.com","subject":"Re: SVN import","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-10-10T18:13:29Z","receivedAt":"2005-10-10T18:13:29Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi,\n\nYasushi SHOJI:\n> just tried on my svn repo, which had flat directory but moved to trunk\n> dir after.  on that repo, the-current-just-pulled git-svnimport says:\n> \n>     1: Unrecognized path: /main.c\n> \nTrue. I could add an option which behaves as if everything that's not\nrecognized is seen as being on the trunk, but ...\n\n>     git-svnimport.perl -C /tmp/test.git -i -v file:///tmp/repo/\n> \nFixed in the last upload -- you get an -s2 option which skips the broken\nfirst check-in, and as a special bonus it manages not to skip the *last*\nversion either. ;-)\n\n-- \nMatthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\nBe like a duck -- keep calm and unruffled on the surface but paddle like the\ndevil under water.\n"},{"id":"9899","messageId":"874q7p1axz.wl@mail2.atmark-techno.com","threadId":"1592","inReplyTo":"20051010181329.GQ567@kiste.smurf.noris.de","subject":"Re: SVN import","fromName":"Yasushi SHOJI","fromEmail":"yashi@atmark-techno.com","sentAt":"2005-10-10T18:30:48Z","receivedAt":"2005-10-10T18:30:48Z","isPatch":false,"sender":{"key":"yashi@atmark-techno.com","avatar":"https://gravatar.com/avatar/4817e8703ac4379935834d87453faa9d0c94b9dc19d83fcc54c67875eb133e59?d=mp&s=160"},"body":"At Mon, 10 Oct 2005 20:13:29 +0200,\nMatthias Urlichs wrote:\n> \n> Yasushi SHOJI:\n> > just tried on my svn repo, which had flat directory but moved to trunk\n> > dir after.  on that repo, the-current-just-pulled git-svnimport says:\n> > \n> >     1: Unrecognized path: /main.c\n> > \n> True. I could add an option which behaves as if everything that's not\n> recognized is seen as being on the trunk, but ...\n\nhmmm. can libsvn see those file had moved in to the trunk?  don't know\nhow 'svn mv' is treated in svn.\n\n> >     git-svnimport.perl -C /tmp/test.git -i -v file:///tmp/repo/\n> > \n> Fixed in the last upload -- you get an -s2 option which skips the broken\n> first check-in, and as a special bonus it manages not to skip the *last*\n> version either. ;-)\n\nthanks for quick fix.  I was gonna report that one too but your fix\nown over my tying speed ;-)\n\n# I guess I need to wait for mirroring script to catch up?\n--\n           yashi\n"},{"id":"9903","messageId":"20051010185729.GR567@kiste.smurf.noris.de","threadId":"1592","inReplyTo":"874q7p1axz.wl@mail2.atmark-techno.com","subject":"Re: SVN import","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-10-10T18:57:30Z","receivedAt":"2005-10-10T18:57:30Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi,\n\nYasushi SHOJI:\n> > True. I could add an option which behaves as if everything that's not\n> > recognized is seen as being on the trunk, but ...\n> \n> hmmm. can libsvn see those file had moved in to the trunk?  don't know\n> how 'svn mv' is treated in svn.\n> \nsee \"svn log\". The script sees the file, and where it comes from (but\nignores that).\n\n> # I guess I need to wait for mirroring script to catch up?\n\n? it was uptodate when I wrote that mail; see\nhttp://netz.smurf.noris.de/cgi/gitweb?p=git.git;a=shortlog;h=svn\n\n-- \nMatthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\nAll intelligent species own cats.\n"},{"id":"9912","messageId":"87y851yvfn.wl@mail2.atmark-techno.com","threadId":"1592","inReplyTo":"20051010185729.GR567@kiste.smurf.noris.de","subject":"Re: SVN import","fromName":"Yasushi SHOJI","fromEmail":"yashi@atmark-techno.com","sentAt":"2005-10-10T20:21:48Z","receivedAt":"2005-10-10T20:21:48Z","isPatch":false,"sender":{"key":"yashi@atmark-techno.com","avatar":"https://gravatar.com/avatar/4817e8703ac4379935834d87453faa9d0c94b9dc19d83fcc54c67875eb133e59?d=mp&s=160"},"body":"At Mon, 10 Oct 2005 20:57:30 +0200,\nMatthias Urlichs wrote:\n> \n> Yasushi SHOJI:\n> > > True. I could add an option which behaves as if everything that's not\n> > > recognized is seen as being on the trunk, but ...\n> > \n> > hmmm. can libsvn see those file had moved in to the trunk?  don't know\n> > how 'svn mv' is treated in svn.\n> > \n> see \"svn log\". The script sees the file, and where it comes from (but\n> ignores that).\n\nwell, if it can, it'd be nice if svnimport could handle those\nfiles. ;-)\n\nanyway, here is another one if you are interested in.  svnimport\ndoesn't seems to handle -t option, or what am i missing?\n\n    svnadmin create --fs-type fsfs /tmp/repo\n    svn co file:///tmp/repo test\n    cd test\n    svn mkdir foo\n    echo hello > foo/hello.c\n    svn add foo/hello.c\n    svn ci -m 'add hello.c'\n    cd ..\n    git-svnimport.perl -t foo -s2 -C /tmp/test.git -i -v file:///tmp/repo\n    DONE; creating master branch\n    cp: cannot stat `/tmp/test.git/.git/refs/heads/origin': No such file or directory\n--\n          yashi\n"},{"id":"9925","messageId":"20051010205202.GS567@kiste.smurf.noris.de","threadId":"1592","inReplyTo":"87y851yvfn.wl@mail2.atmark-techno.com","subject":"Re: SVN import","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-10-10T20:52:02Z","receivedAt":"2005-10-10T20:52:02Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi,\n\nYasushi SHOJI:\n> anyway, here is another one if you are interested in.  svnimport\n> doesn't seems to handle -t option, or what am i missing?\n> \nAt first glance: you're only doing one check-in, which the -s2 option\ntherefore conveniently skips. git-svnimport therefore does nothing. ;-)\n\nNB: Please put thpse svn scripts into a bunch of testcases, and send me a\n    patch...\n\n-- \nMatthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\n\"When a man is tired of Ankh-Morpork, he is tired of ankle-deep slurry.\"\n\t\t-- Terry Pratchett (Mort)\n"},{"id":"10135","messageId":"878xwuldvx.fsf@litku.valo.iki.fi","threadId":"1592","inReplyTo":"pan.2005.10.10.09.45.00.468989@smurf.noris.de","subject":"Re: SVN import","fromName":"Kalle Valo","fromEmail":"kalle.valo@iki.fi","sentAt":"2005-10-15T20:32:50Z","receivedAt":"2005-10-15T20:32:50Z","isPatch":false,"sender":{"key":"kalle.valo@iki.fi","avatar":null},"body":"Matthias Urlichs <smurf@smurf.noris.de> writes:\n\n>> Quick note: I'm working on importing from SVN.\n>\n> The first version seems to be finished.\n>\n> http:/netz/smurf.noris.de/git/git.git, branch \"svn\".\n>\n> Should be ready for merging, though I wouldn't say no to a few testers\n> before that happens.  ;-)\n\nAfter fixing a conflict and a typo in Makefile (patch coming soon) I\ntested this with the bcm43xx driver from\nsvn://svn.berlios.de/bcm43xx/trunk. It seems to work fine. \n\nOnly a minor problem was that I immediately didn't realize the 100\ncommit limit was intentional. Maybe the error message could improved a\nbit. Now it says:\n\n        Exiting due to a memory leak. Repeat, please.\n\nMaybe something like this would be more informative:\n\n        Subversion commit limit reached (to avoid SVN library memory\n        leaks). Exiting, but please repeat the command and it will\n        continue safely.\n\nBut in overall this is a really useful addition to git, I hope it will\nbe merged soon.\n\n-- \nKalle Valo\n"},{"id":"10136","messageId":"874q7ildd2.fsf_-_@litku.valo.iki.fi","threadId":"1592","inReplyTo":"878xwuldvx.fsf@litku.valo.iki.fi","subject":"svnimport: fixed Makefile entry","fromName":"Kalle Valo","fromEmail":"kalle.valo@iki.fi","sentAt":"2005-10-15T20:44:09Z","receivedAt":"2005-10-15T20:44:09Z","isPatch":false,"sender":{"key":"kalle.valo@iki.fi","avatar":null},"body":"Makefile entry for git-svnimport contained a small typo.\n\n---\n\n Makefile |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\napplies-to: b5467f815f8de270a755099df924bff5ed98512e\nbce2921cf6fe774ba4f8edffe35ef914c2a836e6\ndiff --git a/Makefile b/Makefile\nindex 8f2dfb2..1cca928 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -94,7 +94,7 @@ SCRIPT_SH = \\\n SCRIPT_PERL = \\\n \tgit-archimport.perl git-cvsimport.perl git-relink.perl \\\n \tgit-rename.perl git-shortlog.perl git-fmt-merge-msg.perl \\\n-\tgit-findtags.perl git-svnimport-perl\n+\tgit-findtags.perl git-svnimport.perl\n \n SCRIPT_PYTHON = \\\n \tgit-merge-recursive.py\n---\n0.99.8.GIT\n"},{"id":"10148","messageId":"7vy84tdhqv.fsf@assigned-by-dhcp.cox.net","threadId":"1592","inReplyTo":"878xwuldvx.fsf@litku.valo.iki.fi","subject":"Re: SVN import","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-10-16T07:48:56Z","receivedAt":"2005-10-16T07:48:56Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Kalle Valo <Kalle.Valo@iki.fi> writes:\n\n> But in overall this is a really useful addition to git, I hope it will\n> be merged soon.\n\nMatthias, how ready do you feel the code is?  Whenever you are\nready, please just holler.\n\nYou seem to have a small cvsimport updates in the branch.  Mind\nfeeding it to me independently?\n"},{"id":"10157","messageId":"20051016174210.GA8297@kiste.smurf.noris.de","threadId":"1592","inReplyTo":"7vy84tdhqv.fsf@assigned-by-dhcp.cox.net","subject":"Re: SVN import","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-10-16T17:42:10Z","receivedAt":"2005-10-16T17:42:10Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi,\n\nJunio C Hamano:\n> Matthias, how ready do you feel the code is?  Whenever you are\n> ready, please just holler.\n> \nHollering now.\n\nThere's one small omission, which is that the merge RX for SVN should\noptionally recognize the SVN commit number it's merging from and use\nthe corresponsing git commit as the merge parent, but maybe somebody\nelse feels motivated to add that (hint, hint) .\n\n> You seem to have a small cvsimport updates in the branch.  Mind\n> feeding it to me independently?\n> \nWhy? It already is a separate commit (89764f5d..., the one before\nI added the svn script).\n\n-- \nMatthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\nThe Public is merely a multiplied \"me.\"\n\t\t-- Mark Twain\n"},{"id":"10158","messageId":"20051016175809.GB8297@kiste.smurf.noris.de","threadId":"1592","inReplyTo":"878xwuldvx.fsf@litku.valo.iki.fi","subject":"Re: SVN import","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-10-16T17:58:12Z","receivedAt":"2005-10-16T17:58:12Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi,\n\n> Maybe something like this would be more informative:\n> \nThanks; reworded.\n\n-- \nMatthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\nNever put off till run-time what you can do at compile-time.\n\t\t-- D. Gries\n"},{"id":"10159","messageId":"7vpsq5xrix.fsf@assigned-by-dhcp.cox.net","threadId":"1592","inReplyTo":"20051016174210.GA8297@kiste.smurf.noris.de","subject":"Re: SVN import","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-10-16T18:09:42Z","receivedAt":"2005-10-16T18:09:42Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthias Urlichs <smurf@smurf.noris.de> writes:\n\n> Why? It already is a separate commit (89764f5d..., the one before\n> I added the svn script).\n\nThat was a \"just in case you need a bit more time for the full\nmerge of your SVN work\" question.  Pulling the whole thing now.\n"}]}