git svn and multiple cloned repositories

git svn and multiple cloned repositories

[Bruno Harbulot]

Hello,


I participate in a few open-source projects for which I provide patches 
sometimes, but most of these projects use Subversion. git-svn is very 
convenient for trying out patches without interfering with the main 
branch (so as to submit them when they're ready). I presume many 'git 
svn' users do something like this too.

However, I'd like to keep multiple copies of this repository (on a few 
machines, including one on a backup server) with the appropriate SVN 
metadata. I'd also like to be able to do 'git svn fetch' on only one of 
these cloned repositories (perhaps via crontab on the server) and to be 
able to push/pull this SVN metadata along with the commits between the 
cloned git repositories.


Is there a recommended way to do this?


I have found 3 ways of achieving this, but none of them seem ideal:

1. Copying the entire cloned repository as regular files and doing 'git 
svn fetch' regularly on each copy.

    - Doing the initial "git svn clone" on one machine (machine1).
    - Copying the cloned repository onto the backup machine 
(backup-server), using tar for example.
    - Adding the repository on 'backup-server' as a remote repository on 
'machine1' (so that I can push my own branches).
    - Doing 'git svn fetch' regularly on both 'machine1' and 
'backup-server'.

This works, but this duplicates the interactions with the SVN server 
(for as many clones I have locally). This is what I'd like to avoid.


2. Transferring the SVN references by hand.

    - On 'backup-server':
      - git --bare init
      - git --bare svn init -s --prefix=svn/ https://project.example.com/svn
      - git --bare svn fetch
    - On 'machineX':
      - git clone ssh://backup-server/~/Project.git/
      - ssh backup-server "cd Project.git ; tar czf - svn refs/remotes 
info/refs packed-refs" | tar xvzf - -C .git/
      - Edit packed-refs to change "refs/heads/master" into 
"refs/remotes/origin/master".
      - git svn init -s --prefix=svn/ https://project.example.com/svn
      - git svn fetch


3. Using 'git clone --mirror' (only works with --bare option).

(same as 2. on backup-server)
    - git clone --mirror ssh://backup-server/~/Project.git
    - mv Project.git .git
    - Edit .git/config by hand to remove the bare repository option
    - git svn init -s --prefix=svn/ https://project.example.com/svn
    - git svn fetch
(I sill have to use 'git svn fetch' regularly with this).




Best wishes,

Bruno.

Re: git svn and multiple cloned repositories

[Peter Harris]

On Tue, Jun 30, 2009 at 8:23 AM, Bruno Harbulot wrote:
> I participate in a few open-source projects for which I provide patches
> sometimes, but most of these projects use Subversion. git-svn is very
> convenient for trying out patches without interfering with the main branch
> (so as to submit them when they're ready). I presume many 'git svn' users do
> something like this too.
>
> However, I'd like to keep multiple copies of this repository (on a few
> machines, including one on a backup server) with the appropriate SVN
> metadata. I'd also like to be able to do 'git svn fetch' on only one of
> these cloned repositories (perhaps via crontab on the server) and to be able
> to push/pull this SVN metadata along with the commits between the cloned git
> repositories.
>
>
> Is there a recommended way to do this?
>
>
> I have found 3 ways of achieving this, but none of them seem ideal:
>
> 1. Copying the entire cloned repository as regular files and doing 'git svn
> fetch' regularly on each copy.

> 2. Transferring the SVN references by hand.

> 3. Using 'git clone --mirror' (only works with --bare option).

I use 4. Set up git remotes by hand to populate svn remotes directly.

  - On 'backup-server':
git svn clone -s svn://upstream/project
crontab -e  # run git svn fetch periodically

  - On 'machineX':
mkdir project
cd project
git init
git remote add origin git://mirror/project
git config --add remote.origin.fetch refs/remotes/*:refs/remotes/*
git fetch
git svn init -s svn://upstream/project
git reset --hard trunk
git svn rebase

Peter Harris