SVN import

Quick note: I'm working on importing from SVN.

My current main problem is that SVN's Perl interface leaks server connections (apparently nobody has used it for any real work yet), which is of course *bad*, and kindof prevents me from finishing the job today. :-/

Hi, Matthias Urlichs wrote:

The first version seems to be finished.

http:/netz/smurf.noris.de/git/git.git, branch "svn".

Should be ready for merging, though I wouldn't say no to a few testers before that happens. ;-)

On Mon, Oct 10, 2005 at 11:45:05 +0200, Matthias Urlichs wrote:
 > Hi, Matthias Urlichs wrote:
 > 
 > > Quick note: I'm working on importing from SVN.
 > 
 > The first version seems to be finished.
 > 
 > http:/netz/smurf.noris.de/git/git.git, branch "svn".
 > 
 > Should be ready for merging, though I wouldn't say no to a few testers
 > before that happens.  ;-)

Ah cool, was going to work on an SVN counterpart to git-{arch,cvs}import, but now won't have to. ;) Will test and report back. :)

Best, Elfyn

Hi,

Elfyn McBratney:

Please do. I've just pushed a few fixes.

On Mon, Oct 10, 2005 at 11:26:51AM +0100, Elfyn McBratney wrote:
 > On Mon, Oct 10, 2005 at 11:45:05 +0200, Matthias Urlichs wrote:
 >  > Hi, Matthias Urlichs wrote:
 >  > 
 >  > > Quick note: I'm working on importing from SVN.
 >  > 
 >  > The first version seems to be finished.
 >  > 
 >  > http:/netz/smurf.noris.de/git/git.git, branch "svn".
 >  > 
 >  > Should be ready for merging, though I wouldn't say no to a few testers
 >  > before that happens.  ;-)
 > 
 > Ah cool, was going to work on an SVN counterpart to git-{arch,cvs}import,
 > but now won't have to. ;)  Will test and report back. :)

Worth noting that the URL is actually: http://netz.smurf.noris.de/git/git.git ;)

Best, Elfyn

Hi,

Elfyn McBratney:

*Grumble*

NB: Worth noting: the importer actually *requires* a current Perl SVN
module (i.e., 1.2.1). Debian Sarge's version 1.1.4 doesn't work.

Hi, Matthias Urlichs wrote:

The current version seems to actually work with nontrivial repositories (I'm importing gnupg at the moment, which recently switched from CVS to SVN).

Also worth noting is that cvs->svn->git is somewhat more faithful WRT importing CVS archives with "incomplete" or "funky" tags -- it exports their state correctly to SVN, and my importer should be able to get them out again. On the minus side, the two cannot generate the same changesets because cvs2svn rounds timestamps to the next full minute.

Speed: Comparable to the CVS importer when crossing the network: both need
one roundtrip per file. I haven't done any tests with local repositories.

Hi Matthias,

Great work!

At Mon, 10 Oct 2005 11:45:05 +0200, Matthias Urlichs wrote:

just tried on my svn repo, which had flat directory but moved to trunk dir after. on that repo, the-current-just-pulled git-svnimport says:

    1: Unrecognized path: /main.c

to reproduce:

    svnadmin create --fs-type fsfs /tmp/repo
    svn co file:///tmp/repo test
    cd test
    touch main.c
    svn add main.c
    svn ci main.c -m 'testing svnimport'
    svn mkdir trunk
    svn move main.c trunk
    svn ci -m 'move main.c to trunk/'
    cd ..
    git-svnimport.perl -C /tmp/test.git -i -v file:///tmp/repo/

hope this helps,
--
          yashi

Hi,

Yasushi SHOJI:

True. I could add an option which behaves as if everything that's not recognized is seen as being on the trunk, but ...

Fixed in the last upload -- you get an -s2 option which skips the broken first check-in, and as a special bonus it manages not to skip the *last* version either. ;-)

At Mon, 10 Oct 2005 20:13:29 +0200, Matthias Urlichs wrote:

hmmm. can libsvn see those file had moved in to the trunk? don't know how 'svn mv' is treated in svn.

thanks for quick fix. I was gonna report that one too but your fix own over my tying speed ;-)

# I guess I need to wait for mirroring script to catch up?
--
           yashi

Hi,

Yasushi SHOJI:

see "svn log". The script sees the file, and where it comes from (but ignores that).

? it was uptodate when I wrote that mail; see http://netz.smurf.noris.de/cgi/gitweb?p=git.git;a=shortlog;h=svn

At Mon, 10 Oct 2005 20:57:30 +0200, Matthias Urlichs wrote:

well, if it can, it'd be nice if svnimport could handle those files. ;-)

anyway, here is another one if you are interested in. svnimport doesn't seems to handle -t option, or what am i missing?

    svnadmin create --fs-type fsfs /tmp/repo
    svn co file:///tmp/repo test
    cd test
    svn mkdir foo
    echo hello > foo/hello.c
    svn add foo/hello.c
    svn ci -m 'add hello.c'
    cd ..
    git-svnimport.perl -t foo -s2 -C /tmp/test.git -i -v file:///tmp/repo
    DONE; creating master branch
    cp: cannot stat `/tmp/test.git/.git/refs/heads/origin': No such file or directory
--
          yashi

Hi,

Yasushi SHOJI:

At first glance: you're only doing one check-in, which the -s2 option therefore conveniently skips. git-svnimport therefore does nothing. ;-)

NB: Please put thpse svn scripts into a bunch of testcases, and send me a
    patch...

Matthias Urlichs <smurf@smurf.noris.de> writes:

After fixing a conflict and a typo in Makefile (patch coming soon) I tested this with the bcm43xx driver from svn://svn.berlios.de/bcm43xx/trunk. It seems to work fine.

Only a minor problem was that I immediately didn't realize the 100 commit limit was intentional. Maybe the error message could improved a bit. Now it says:

        Exiting due to a memory leak. Repeat, please.

Maybe something like this would be more informative:

        Subversion commit limit reached (to avoid SVN library memory
        leaks). Exiting, but please repeat the command and it will
        continue safely.

But in overall this is a really useful addition to git, I hope it will be merged soon.

Makefile entry for git-svnimport contained a small typo.

---

 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: b5467f815f8de270a755099df924bff5ed98512e bce2921cf6fe774ba4f8edffe35ef914c2a836e6

Kalle Valo <Kalle.Valo@iki.fi> writes:

Matthias, how ready do you feel the code is? Whenever you are ready, please just holler.

You seem to have a small cvsimport updates in the branch. Mind feeding it to me independently?

Hi,

Junio C Hamano:

Hollering now.

There's one small omission, which is that the merge RX for SVN should optionally recognize the SVN commit number it's merging from and use the corresponsing git commit as the merge parent, but maybe somebody else feels motivated to add that (hint, hint) .

Why? It already is a separate commit (89764f5d..., the one before I added the svn script).

Matthias Urlichs <smurf@smurf.noris.de> writes:

That was a "just in case you need a bit more time for the full merge of your SVN work" question. Pulling the whole thing now.

Hi,

Thanks; reworded.