Re: Question about git-svn import

From: Pascal Obry <pascal.obry@gmail.com>
Date: Dec 20, 2007, 16:30 UTC
Message-ID: <476A98BB.8000900@obry.net>
In-Reply-To: <20071218153159.GA12549@alea.gnuu.de>

Jörg,

I have at least one remaining problem.

# Import old trunk into pre/master $ git svn init svn+ssh://myserver --prefix=pre/ --trunk=importfromcvs/trunk $ git svn fetch --revision=9458:10242

# Import new trunk into post/master $ git config svn-remote.svn.fetch trunk/PROJ:refs/remotes/post/trunk $ git svn fetch --revision=11058:11066

# Rewrite post/trunk on top of pre/trunk into merged-master $ git checkout post/trunk $ git checkout -b merged-master $ git-filter-branch --tag-name-filter cat --parent-filter "sed -e 's/^$/-p $(git rev-parse pre/trunk)/'" merged-master

The problem is that at this point I cannot "git svn rebase". Looks like the filter-branch command did break the link between the Subversion repository and the git svn one:

$ git svn rebase Unable to determine upstream SVN information from working tree history

Is there a way around that ?

Thanks, Pascal.

-- 
--|------------------------------------------------------
--| Pascal Obry                           Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--|              http://www.obry.net
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595