Re: question: connecting to multiple remote svn projects

From: Avery Pennarun <apenwarr@gmail.com>
Date: Nov 9, 2009, 18:43 UTC
Message-ID: <32541b130911091043k78ac009dmb49ecdb0beaa597f@mail.gmail.com>
In-Reply-To: <hd8smd$79e$2@ger.gmane.org>

On Mon, Nov 9, 2009 at 5:59 AM, Dave Rodgman <dav1dr@eml.cc> wrote:

> As far as I can understand, git-submodule pulls in a specific commit,
> as does git subtree? I've experimented a little but with not much success.

Well, they both pull in a specific commit *and* all the history leading up to it, although the two of them do it in slightly different ways.

Show 7 quoted lines

> I want "git svn rebase" (or some equivalent command, or series of
> commands) to update the contents of module1/work to the latest commit
> into this branch, and similarly "git svn dcommit" should also commit into
> module1, module2, etc. Basically, I want my working copy to have the same
> functionality as if moduleX/work was the actual layout in subversion. I'm
> using git as a client for a svn repository, rather than doing a one-time
> import. Is this possible?

Yes. Both tools will work for two-way svn import/export, although submodules will probably be a bit more convenient.

Essentially, you create one branch (and one git-svn remote entry) for each svn subproject, and one branch for the combined project. In the combined project, your .gitmodules should use '.' as the submodule repository path (since all your submodule objects are in the same local repo).

Then you 'git svn fetch' to retrieve the latest from each svn project.

Then, in each submodule, you can 'git pull .. git-svn-branchname' to get the latest stuff from git-svn for that branch.

Then, in the combined project, you 'git commit' to lock in those commits.

It's a little screwy, but it works :)

Avery