git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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: Sun, 24 Jul 2011 21:44:39 +0200	[thread overview]
Message-ID: <4E2C7627.8050104@web.de> (raw)
In-Reply-To: <CAJs9aZ8fAPzr6Lo1EUO+Lnr1pHm=dNr6P5oYgpXE1RqkmMX7hA@mail.gmail.com>

Am 24.07.2011 10:00, schrieb rupert THURNER:
> On Sat, Jul 23, 2011 at 20:19, Jens Lehmann <Jens.Lehmann@web.de> wrote:
>> 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.
> 
> how would the standard git case work, to continue with the example above:
>   git clone test test1
>   git clone test1 test2

I don't think you should clone "test" directly, but rather push that to
a bare repo or git server so others can clone from there. And as the
GeoIP submodule is its own git repo, it has to have someplace to be
pushed to too. That url must be configured in the .gitmodules file and
you have to call "git submodule sync" before you commit and push the "test"
superproject and push the GeoIP submodule so others can use "git submodule
init" and "git submodule update" in their "test" clone to get the submodule
too.

The "test" repo you set up with "git svn clone" could be where you integrate
changes coming from svn (git svn people please stop me if this is rubbish,
I'm just making assumptions here!) which are then pushed to the shared git
repo so your coworkers can fetch it from there.

> if then sombody changes test, and i want to get these changes into
> test2, without involving test1, and rebase what is there?

I'm not sure I understand what you mean here. But you can control what to
check out using different branches for different purposes.

      reply	other threads:[~2011-07-24 19:45 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
2011-07-24  8:00   ` rupert THURNER
2011-07-24 19:44     ` Jens Lehmann [this message]

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=4E2C7627.8050104@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).