# git-svnimport 11 messages from 2007-10-25 to 2007-10-30. Participants: Felipe Balbi, Johannes Schindelin, Steven Walter, Gerrit Pape, Steven Grimm, Junio C Hamano. Thread: https://gitlist.dev/t/10458 ## Felipe Balbi, 2007-10-25 09:25 Subject: git-svnimport Message-ID: <31e679430710250225w39a876d0w738d819245e514e@mail.gmail.com> URL: https://gitlist.dev/e/31e679430710250225w39a876d0w738d819245e514e%40mail.gmail.com ``` Hello all, I was importing busybox svn repository to git but I got a connection timeout after more than 19k commits... is there a way to continue where the error happened or should I do it all over again ?? Thanks -- Best Regards, Felipe Balbi felipebalbi@users.sourceforge.net ``` ## Johannes Schindelin, 2007-10-25 10:56 Subject: Re: git-svnimport Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0710251132580.25221%40racer.site In-Reply-To: <31e679430710250225w39a876d0w738d819245e514e@mail.gmail.com> ``` Hi, On Thu, 25 Oct 2007, Felipe Balbi wrote: > I was importing busybox svn repository to git but I got a connection > timeout after more than 19k commits... is there a way to continue where > the error happened or should I do it all over again ?? AFAICT git-svn is better suited, even to one-shot importing svn. As it happens, I got interested in this project, too, and did an import some time ago. For your pleasure, I uploaded it to http://repo.or.cz/w/busybox.git/ Hth, Dscho ``` ## Felipe Balbi, 2007-10-25 11:08 Subject: Re: git-svnimport Message-ID: <31e679430710250408g679538e7ha9e1e75507c2aac5@mail.gmail.com> URL: https://gitlist.dev/e/31e679430710250408g679538e7ha9e1e75507c2aac5%40mail.gmail.com In-Reply-To: ``` Hi, On 10/25/07, Johannes Schindelin wrote: > Hi, > > On Thu, 25 Oct 2007, Felipe Balbi wrote: > > > I was importing busybox svn repository to git but I got a connection > > timeout after more than 19k commits... is there a way to continue where > > the error happened or should I do it all over again ?? > > AFAICT git-svn is better suited, even to one-shot importing svn. > > As it happens, I got interested in this project, too, and did an import > some time ago. For your pleasure, I uploaded it to > > http://repo.or.cz/w/busybox.git/ thanks... much better... I'm cloning your tree and I'll merge with current busybox tree... ;-) > > Hth, > Dscho > > -- Best Regards, Felipe Balbi felipebalbi@users.sourceforge.net ``` ## Johannes Schindelin, 2007-10-25 13:04 Subject: Re: git-svnimport Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0710251403160.25221%40racer.site In-Reply-To: <31e679430710250408g679538e7ha9e1e75507c2aac5@mail.gmail.com> ``` Hi, On Thu, 25 Oct 2007, Felipe Balbi wrote: > On 10/25/07, Johannes Schindelin wrote: > > > On Thu, 25 Oct 2007, Felipe Balbi wrote: > > > > > I was importing busybox svn repository to git but I got a connection > > > timeout after more than 19k commits... is there a way to continue > > > where the error happened or should I do it all over again ?? > > > > AFAICT git-svn is better suited, even to one-shot importing svn. > > > > As it happens, I got interested in this project, too, and did an > > import some time ago. For your pleasure, I uploaded it to > > > > http://repo.or.cz/w/busybox.git/ > > thanks... much better... I'm cloning your tree and I'll merge with > current busybox tree... ;-) FYI you'll have to do something like this: git svn init svn://busybox.net/trunk/busybox git svn fetch to merge with current busybox (although I updated before I pushed). Ciao, Dscho ``` ## Steven Walter, 2007-10-25 22:20 Subject: Re: git-svnimport Message-ID: <20071025222029.GA11677@dervierte> URL: https://gitlist.dev/e/20071025222029.GA11677%40dervierte In-Reply-To: ``` On Thu, Oct 25, 2007 at 02:04:29PM +0100, Johannes Schindelin wrote: > FYI you'll have to do something like this: > > git svn init svn://busybox.net/trunk/busybox > git svn fetch > > to merge with current busybox (although I updated before I pushed). More than that, you'll want to: git svn init cp .git/refs/remotes/origin/master .git/refs/remotes/git-svn git svn fetch If git-svn doesn't find a remote named "git-svn" it will assume that it has no information about the repository and starting doing a full checkout. By copying the ref, git-svn will see that there are already commits with git-svn-id lines and rebuild its "rev-db". After that, it will incrementally update for newer revisions. That ought to save you a few precious minutes :) -- -Steven Walter Freedom is the freedom to say that 2 + 2 = 4 B2F1 0ECC E605 7321 E818 7A65 FC81 9777 DC28 9E8F ``` ## Johannes Schindelin, 2007-10-25 22:22 Subject: Re: git-svnimport Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0710252322320.4362%40racer.site In-Reply-To: <20071025222029.GA11677@dervierte> ``` Hi, On Thu, 25 Oct 2007, Steven Walter wrote: > On Thu, Oct 25, 2007 at 02:04:29PM +0100, Johannes Schindelin wrote: > > FYI you'll have to do something like this: > > > > git svn init svn://busybox.net/trunk/busybox > > git svn fetch > > > > to merge with current busybox (although I updated before I pushed). > > More than that, you'll want to: > > git svn init > cp .git/refs/remotes/origin/master .git/refs/remotes/git-svn > git svn fetch > > If git-svn doesn't find a remote named "git-svn" it will assume that it > has no information about the repository and starting doing a full > checkout. By copying the ref, git-svn will see that there are already > commits with git-svn-id lines and rebuild its "rev-db". After that, it > will incrementally update for newer revisions. > > That ought to save you a few precious minutes :) Good catch. Thanks. Ciao, Dscho ``` ## Gerrit Pape, 2007-10-26 14:55 Subject: Re: git-svnimport Message-ID: <20071026145520.2141.qmail@7a6a65599aed61.315fe32.mid.smarden.org> URL: https://gitlist.dev/e/20071026145520.2141.qmail%407a6a65599aed61.315fe32.mid.smarden.org In-Reply-To: ``` On Thu, Oct 25, 2007 at 11:56:44AM +0100, Johannes Schindelin wrote: > On Thu, 25 Oct 2007, Felipe Balbi wrote: > > I was importing busybox svn repository to git but I got a connection > > timeout after more than 19k commits... is there a way to continue where > > the error happened or should I do it all over again ?? > > AFAICT git-svn is better suited, even to one-shot importing svn. AIUI git-svnimport provides a subset of git-svn's functionality. There've been some problems with git-svnimport reported through the Debian BTS http://bugs.debian.org/436930 http://bugs.debian.org/447325 http://bugs.debian.org/447965 I'm not sure these are worth fixing, I'd rather suggest to drop git-svnimport in favor of git-svn, and not installing it in future versions. Regards, Gerrit. ``` ## Johannes Schindelin, 2007-10-26 16:45 Subject: Re: git-svnimport Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0710261745110.4362%40racer.site In-Reply-To: <20071026145520.2141.qmail@7a6a65599aed61.315fe32.mid.smarden.org> ``` Hi, On Fri, 26 Oct 2007, Gerrit Pape wrote: > http://bugs.debian.org/436930 > http://bugs.debian.org/447325 > http://bugs.debian.org/447965 > > I'm not sure these are worth fixing, I'd rather suggest to drop > git-svnimport in favor of git-svn, and not installing it in future > versions. I already proposed this. The outcome was... silent. Ciao, Dscho ``` ## Steven Grimm, 2007-10-26 18:06 Subject: Re: git-svnimport Message-ID: <47222CB3.9070100@midwinter.com> URL: https://gitlist.dev/e/47222CB3.9070100%40midwinter.com In-Reply-To: ``` Johannes Schindelin wrote: >> I'm not sure these are worth fixing, I'd rather suggest to drop >> git-svnimport in favor of git-svn, and not installing it in future >> versions. >> > I already proposed this. The outcome was... silent. > Me too, and same reaction. So I vote we interpret that as, "No objections from anyone." -Steve ``` ## Junio C Hamano, 2007-10-26 19:30 Subject: Re: git-svnimport Message-ID: <7vy7dpy8qf.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vy7dpy8qf.fsf%40gitster.siamese.dyndns.org In-Reply-To: <47222CB3.9070100@midwinter.com> ``` Steven Grimm writes: > Johannes Schindelin wrote: >>> I'm not sure these are worth fixing, I'd rather suggest to drop >>> git-svnimport in favor of git-svn, and not installing it in future >>> versions. >>> >> I already proposed this. The outcome was... silent. >> > > Me too, and same reaction. > > So I vote we interpret that as, "No objections from anyone." Likewise. ``` ## Gerrit Pape, 2007-10-30 14:24 Subject: [PATCH] no longer install git-svnimport, move to contrib/examples Message-ID: <20071030142427.6467.qmail@76c770d547b63d.315fe32.mid.smarden.org> URL: https://gitlist.dev/e/20071030142427.6467.qmail%4076c770d547b63d.315fe32.mid.smarden.org In-Reply-To: <7vy7dpy8qf.fsf@gitster.siamese.dyndns.org> ``` On Fri, Oct 26, 2007 at 12:30:16PM -0700, Junio C Hamano wrote: > Steven Grimm writes: > > Johannes Schindelin wrote: > >>> I'm not sure these are worth fixing, I'd rather suggest to drop > >>> git-svnimport in favor of git-svn, and not installing it in future > >>> versions. > >>> > >> I already proposed this. The outcome was... silent. > > > > Me too, and same reaction. > > > > So I vote we interpret that as, "No objections from anyone." > > Likewise. Signed-off-by: Gerrit Pape --- .gitignore | 1 - Documentation/cmd-list.perl | 1 - Makefile | 3 +-- contrib/completion/git-completion.bash | 1 - .../examples/git-svnimport.perl | 0 .../examples}/git-svnimport.txt | 0 6 files changed, 1 insertions(+), 5 deletions(-) rename git-svnimport.perl => contrib/examples/git-svnimport.perl (100%) rename {Documentation => contrib/examples}/git-svnimport.txt (100%) diff --git a/.gitignore b/.gitignore index 62afef2..8670081 100644 --- a/.gitignore +++ b/.gitignore @@ -128,7 +128,6 @@ git-status git-stripspace git-submodule git-svn -git-svnimport git-symbolic-ref git-tag git-tar-tree diff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl index 1061fd8..8d21d42 100755 --- a/Documentation/cmd-list.perl +++ b/Documentation/cmd-list.perl @@ -185,7 +185,6 @@ git-status mainporcelain git-stripspace purehelpers git-submodule mainporcelain git-svn foreignscminterface -git-svnimport foreignscminterface git-symbolic-ref plumbingmanipulators git-tag mainporcelain git-tar-tree plumbinginterrogators diff --git a/Makefile b/Makefile index 72f5ef4..eb98d91 100644 --- a/Makefile +++ b/Makefile @@ -225,8 +225,7 @@ SCRIPT_SH = \ SCRIPT_PERL = \ git-add--interactive.perl \ git-archimport.perl git-cvsimport.perl git-relink.perl \ - git-cvsserver.perl git-remote.perl \ - git-svnimport.perl git-cvsexportcommit.perl \ + git-cvsserver.perl git-remote.perl git-cvsexportcommit.perl \ git-send-email.perl git-svn.perl SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index e760930..599b2fc 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -346,7 +346,6 @@ __git_commands () ssh-*) : transport;; stripspace) : plumbing;; svn) : import export;; - svnimport) : import;; symbolic-ref) : plumbing;; tar-tree) : deprecated;; unpack-file) : plumbing;; diff --git a/git-svnimport.perl b/contrib/examples/git-svnimport.perl similarity index 100% rename from git-svnimport.perl rename to contrib/examples/git-svnimport.perl diff --git a/Documentation/git-svnimport.txt b/contrib/examples/git-svnimport.txt similarity index 100% rename from Documentation/git-svnimport.txt rename to contrib/examples/git-svnimport.txt -- 1.5.3.4 ```