From: "Jörg Sommer" <joerg@alea.gnuu.de>
To: git list <git@vger.kernel.org>
Subject: Re: Question about git-svn import
Date: Thu, 20 Dec 2007 17:52:27 +0100 [thread overview]
Message-ID: <20071220165227.GB22683@alea.gnuu.de> (raw)
In-Reply-To: <476A98BB.8000900@obry.net>
[-- Attachment #1: Type: text/plain, Size: 1096 bytes --]
Pascal Obry schrieb am Thu 20. Dec, 17:30 (+0100):
> # 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.
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2007-12-20 16:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-17 17:18 Question about git-svn import Pascal Obry
2007-12-18 3:48 ` Steven Walter
2007-12-18 7:10 ` Pascal Obry
2007-12-18 15:31 ` Jörg Sommer
2007-12-19 11:29 ` Pascal Obry
2007-12-20 16:30 ` Pascal Obry
2007-12-20 16:52 ` Jörg Sommer [this message]
2007-12-21 13:11 ` Pascal Obry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071220165227.GB22683@alea.gnuu.de \
--to=joerg@alea.gnuu.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).