git/list[1] front-page[2] threads[3] people[4] search[5] about
 

How to sync two svn repositories via git?

From
JWJosef Wolf <jw@raven.inka.de>
Date
Apr 1, 2009, 22:30 UTC
Message-ID
<20090401223052.GA28619@raven.wolf.lan>
Hello,

I have two subversion repositories which I would like to synchronize via git-svn. For this, I have set up a git repository and configured two branches to track the subversion repositories via git-svn:

    mkdir test-sync
    cd    test-sync
    git svn init --stdlayout file://$REPOSDIR/svn-first
    for repos in svn-first svn-second; do
        git config svn-remote.$repos.url      file://$REPOSDIR/$repos
        git config svn-remote.$repos.fetch    trunk:refs/remotes/$repos/trunk
        git config svn-remote.$repos.branches branches/*:refs/remotes/$repos/*
        git config svn-remote.$repos.tags     tags/*:refs/remotes/$repos/tags/*
        git svn fetch -R $repos
        git checkout -b $repos $repos/trunk
    done
    git gc
This gives me two remote and two local branches:
    master                                                                                    
    svn-first                                                                                 
  * svn-second                                                                                
    svn-first/trunk                                                                           
    svn-second/trunk                                                                          

The first step I'd like to do is to "mirror" the manual merges that were done between the subversion repositories in the past:

    git checkout svn-first
    git merge -s ours --log commit-of-the-first-merge-in-svn-second
    git checkout svn-second
    git merge -s ours --log commit-of-the-first-merge-in-svn-first

This seems to work, but git-gui shows conflicts. How can I get conflicts when I use the "-s ours" merge strategy?

Next: Michael J Gruber
Message 1 of 3 in “How to sync two svn repositories via git?”
  1. Josef WolfApr 1, 2009
  2. Michael J GruberApr 2, 2009
  3. Josef WolfApr 2, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.