From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Thu, 02 Apr 2009 07:41:31 GMT
Subject: Re: How to sync two svn repositories via git?
Message-ID: <49D46C2B.3080100@drmicha.warpmail.net>
In-Reply-To: <20090401223052.GA28619@raven.wolf.lan>

Josef Wolf venit, vidit, dixit 02.04.2009 00:30:
> 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?

What do git status and git diff (--stat, --combined) say?