Re: Question about git-svn import

From: Jörg Sommer <joerg@alea.gnuu.de>
Date: Dec 20, 2007, 16:52 UTC
Message-ID: <20071220165227.GB22683@alea.gnuu.de>
In-Reply-To: <476A98BB.8000900@obry.net>

Pascal Obry schrieb am Thu 20. Dec, 17:30 (+0100):

Show 14 quoted lines

> # 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 ?

According to http://duncan.mac-vicar.com/blog/archives/282 it should help to do something like:

git update-ref refs/remotes/git-svn master find -name .rev_db* | xargs rm

I didn't had this problem, because I did a one‐time import.

Bye, Jörg.

-- 
Die zehn Gebote Gottes enthalten 172 Wörter, die amerikanische
Unabhängigkeitserklärung 300 Wörter, die Verordnung der europäischen
Gemeinschaft über den Import von Karamelbonbons exakt 25911 Wörter.