Most elegant way to reference to SVN from GIT?

Most elegant way to reference to SVN from GIT?

[Manuel Reimer]

Hello,

I'm using GIT for a project.

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?

Thanks in advance

Yours

Manuel

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

[Jeff King]

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

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

[Manuel Reimer]

Jeff King wrote:
> You can pull their commits into git using git-svn, and then merge them.

Tried that, but maybe I did something wrong.

If I have a git-svn repo inside my git repo, then for some reason my own repo 
doesn't known the git-svn repo. Means that I cannot push changes, that occured 
in the SVN repo, to my GIT server.

So I'm still searching for an elegant way to get SVN into my GIT repo. As 
submodules make it more difficult to clone the project, I think it would be nice 
to be just able to fetch the stuff from SVN "commit by commit" and then have 
them as git commits in my own tree. So far I wasn't able to get this done...

Yours

Manuel

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

[Jakub Narebski]

Manuel Reimer <Manuel.Spam@nurfuerspam.de> writes:
> Jeff King wrote:

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

Nb. there is also so called "remote helper" approach, where you can
use repositories using other SCM just like native remote Git
repositories.  But I think it is in early beta, or even alpha stages -
- adding support for Subversion was this year Google Summer of Code
2011 project.
 
> Tried that, but maybe I did something wrong.
> 
> If I have a git-svn repo inside my git repo, then for some reason my
> own repo doesn't known the git-svn repo. Means that I cannot push
> changes, that occured in the SVN repo, to my GIT server.

Errr... isn't it more or less expected for _any_ remote repository
added, be it native (git) or Subversion one?

Remote tracking branches are not usually pushed / fetched, unless you
clone in a mirror mode, or set refspecs for fecthing / pushing by
hand...

-- 
Jakub Narębski