Re: Most elegant way to reference to SVN from GIT?

From: Jeff King <peff@peff.net>
Date: Sep 18, 2011, 03:43 UTC
Message-ID: <20110918034318.GC17977@sigill.intra.peff.net>
In-Reply-To: <j53c2h$gff$2@dough.gmane.org>

On Sun, Sep 18, 2011 at 01:51:44AM +0200, Manuel Reimer wrote:

> Now someone offered to contribute a translation. This translation is
> hosted on a SVN server.
> 
> How can I get his work into my GIT tree and how can I keep things updated?

You can pull their commits into git using git-svn, and then merge them. Try:

  # make a new repo side by side with your project that contains
  # their translation
  cd /path/to/your-project/..
  git svn clone https://host/their-subversion-repo their-translation

  # inspect with "git log", "ls", etc to make sure it looks sane
  # if so, then merge it in
  cd ../your-project
  git pull ../their-translation git-svn

  # months later, get an update
  cd their-translation
  git svn fetch
  cd ../your-project
  git pull ../their-translation git-svn

I think you could also do it all in one repo by using "git svn init" and "git svn fetch", but you'd have to check "git help svn" for the exact syntax.

-Peff