From: Jens Lehmann <Jens.Lehmann@web.de>
To: rupert THURNER <rupert.thurner@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: submodule add does not consider git svn
Date: Sat, 23 Jul 2011 20:19:35 +0200 [thread overview]
Message-ID: <4E2B10B7.3010903@web.de> (raw)
In-Reply-To: <CAJs9aZ9cMZd5PfOW7Zfza3un5JqKRM5eQdDpKPCWvLn-vkzktA@mail.gmail.com>
Am 23.07.2011 05:33, schrieb rupert THURNER:
> it seems that "git submodule add" looses information from "git svn
> clone". what am i missing here which would allow to "git svn rebase"
> the repository, even if it is newly added as submodule?
>
> the following example takes a little, as the repository has 15'000
> revisions, even 99% do not concern the checked out part.
>
> rupert @ login : ~/tmp/subm-bug
> mkdir -p ~/tmp/subm-bug
> cd ~/tmp/subm-bug
> git svn clone https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/GeoIP/trunk
> GeoIP
> git init test
> cd test
> git submodule add ~/tmp/subm-bug/GeoIP
> cd GeoIP
> git svn rebase
>
> Migrating from a git-svn v1 layout...
> Data from a previous version of git-svn exists, but
> .git/svn
> (required for this version (1.7.5.4) of git-svn) does not exist.
> Done migrating from a git-svn v1 layout
> Unable to determine upstream SVN information from working tree history
That is because in your example "git submodule add" clones that repo
*again* from where you put it using "git svn clone". I am not really
familiar with git svn, but I assume it is intended that when you clone
such a repo it "forgets" that it was connected with a svn repo. Try the
following instead:
git init test
cd test
git svn clone https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/GeoIP/trunk GeoIP
git submodule add ./GeoIP # Add existing git svn repo GeoIP in place
cd GeoIP
git svn rebase
Of course when you push that submodule somewhere else using git I expect
that "git svn rebase" won't work when you clone that somewhere else, just
like it happened in your example.
next prev parent reply other threads:[~2011-07-23 18:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-23 3:33 submodule add does not consider git svn rupert THURNER
2011-07-23 18:19 ` Jens Lehmann [this message]
2011-07-24 8:00 ` rupert THURNER
2011-07-24 19:44 ` Jens Lehmann
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=4E2B10B7.3010903@web.de \
--to=jens.lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=rupert.thurner@gmail.com \
/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).