From: Pascal Obry <pascal.obry@gmail.com>
To: "Jörg Sommer" <joerg@alea.gnuu.de>
Cc: git list <git@vger.kernel.org>
Subject: Re: Question about git-svn import
Date: Thu, 20 Dec 2007 17:30:51 +0100 [thread overview]
Message-ID: <476A98BB.8000900@obry.net> (raw)
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
next prev parent reply other threads:[~2007-12-20 16:31 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 [this message]
2007-12-20 16:52 ` Jörg Sommer
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=476A98BB.8000900@obry.net \
--to=pascal.obry@gmail.com \
--cc=git@vger.kernel.org \
--cc=joerg@alea.gnuu.de \
/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).