git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* git-svn changing file:// to svn+ssh://
@ 2009-10-26 18:49 Pascal Obry
  2009-10-26 19:18 ` Avery Pennarun
  0 siblings, 1 reply; 3+ messages in thread
From: Pascal Obry @ 2009-10-26 18:49 UTC (permalink / raw)
  To: git list


I'm working on preparing Git SVN mirrors.

I had tested my procedure on a small project and it was working fine.

On a large project it is failing. Here is what I have done:

I have cloned the repository using:

    $ git svn clone --prefix=svn/ file:///path/repo \
	--revision=15314:HEAD --trunk=trunk/project \
	--tags=tags/project --branches=branches/project \
	--branches="branches/global/*/project" project

Not simple, ok but working :)

Now I have converted the file:// to svn+ssh:// using:

    $ git gc

    $ git filter-branch --msg-filter \
     'sed "s,git-svn-id: file:///path/repo,git-svn-id: 
svn+ssh://server/repo,g"' \
     $(cat .git/packed-refs | awk '// {print $2}' | grep -v 'pack-refs')

    $ rm -fr .git/svn

I have edited .git/config to change the url string too.

Up to there, no problem. But when trying to rebase and reconstruct all 
rev_map files with:

    $ git svn rebase

I get the following lines again and again:

Rebuilding 
.git/svn/svn/trunk/.rev_map.f8352e7e-cb20-0410-8ce7-b5d9e71c585c ...
Done rebuilding 
.git/svn/svn/trunk/.rev_map.f8352e7e-cb20-0410-8ce7-b5d9e71c585c
Rebuilding 
.git/svn/svn/trunk/.rev_map.f8352e7e-cb20-0410-8ce7-b5d9e71c585c ...
Done rebuilding 
.git/svn/svn/trunk/.rev_map.f8352e7e-cb20-0410-8ce7-b5d9e71c585c

...

The file 
.git/svn/svn/trunk/.rev_map.f8352e7e-cb20-0410-8ce7-b5d9e71c585c is in 
fact not created.

What could be wrong?

How should I proceed to debug this?

Any help appreciated.

Last note I've tried all this with Git 1.6.4 and 1.6.5.

Thanks,
Pascal.

-- 

--|------------------------------------------------------
--| Pascal Obry                           Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--|    http://www.obry.net  -  http://v2p.fr.eu.org
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver keys.gnupg.net --recv-key F949BD3B

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: git-svn changing file:// to svn+ssh://
  2009-10-26 18:49 git-svn changing file:// to svn+ssh:// Pascal Obry
@ 2009-10-26 19:18 ` Avery Pennarun
  2009-10-27 17:17   ` Sam Vilain
  0 siblings, 1 reply; 3+ messages in thread
From: Avery Pennarun @ 2009-10-26 19:18 UTC (permalink / raw)
  To: pascal; +Cc: git list

On Mon, Oct 26, 2009 at 2:49 PM, Pascal Obry <pascal@obry.net> wrote:
> On a large project it is failing. Here is what I have done:
>
> I have cloned the repository using:
>
>   $ git svn clone --prefix=svn/ file:///path/repo \
>        --revision=15314:HEAD --trunk=trunk/project \
>        --tags=tags/project --branches=branches/project \
>        --branches="branches/global/*/project" project
>
> Not simple, ok but working :)
>
> Now I have converted the file:// to svn+ssh:// using:

I'm not sure about the actual bug you're experiencing, but you could
have done this more simply using the --rewrite-root option to git-svn.
 It might still save you time to just do that from scratch.

If you really want to debug it, you might want to run it through
'strace' and see if it's having any trouble creating those files.

Have fun,

Avery

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: git-svn changing file:// to svn+ssh://
  2009-10-26 19:18 ` Avery Pennarun
@ 2009-10-27 17:17   ` Sam Vilain
  0 siblings, 0 replies; 3+ messages in thread
From: Sam Vilain @ 2009-10-27 17:17 UTC (permalink / raw)
  To: Avery Pennarun; +Cc: pascal, git list

On Mon, 2009-10-26 at 15:18 -0400, Avery Pennarun wrote:
> > Now I have converted the file:// to svn+ssh:// using:
> 
> I'm not sure about the actual bug you're experiencing, but you could
> have done this more simply using the --rewrite-root option to git-svn.
>  It might still save you time to just do that from scratch.

Another thing: if your file:// repository was copied from the original
location using SVN::Mirror or svnsync, then git-svn is capable of
reading the breadcrumbs left by those tools with a switch and rewriting
the git-svn-id: lines accordingly.

Sam

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-10-27 17:18 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-26 18:49 git-svn changing file:// to svn+ssh:// Pascal Obry
2009-10-26 19:18 ` Avery Pennarun
2009-10-27 17:17   ` Sam Vilain

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).