Re: [Gramps-devel] using git-svn to work on the gramps34 branch?

[Vassilii K. <vas...@ta...>]

On 06.05.2013 22:22, John Ralls wrote:
> On May 6, 2013, at 11:59 AM, Vassilii Khachaturov <vas...@ta...> wrote:
>
>> [core]
>>     repositoryformatversion = 0
>>     filemode = true
>>     bare = false
>>     logallrefupdates = true
>> [remote "mirror"]
>>     fetch = +refs/heads/*:refs/remotes/mirror/*
>>     url = https://github.com/jralls/Gramps
>> [branch "trunk"]
>>     remote = mirror
>>     merge = refs/heads/trunk
>> [svn-remote "svn"]
>>     url = svn+ssh://vas...@sv.../p/gramps/code
>>     fetch = trunk:refs/remotes/mirror/trunk
>>     branches = branches/*:refs/remotes/mirror/*
>>     tags = tags/*:refs/remotes/mirror/tags/*
>> [branch "maintenance/gramps34"]
>>     remote = mirror
>>     merge = refs/heads/maintenance/gramps34
>>
>> Do I need to add under the svn-remote an additional fetch? smth like
>>     fetch = maintenance/gramps34:refs/remotes/mirror/maintenance/gramps34
>>
> My layout is a bit different because I didn't use --stdlayout on git svn init:
> [branch "gramps34"]
> 	remote = origin
> 	merge = refs/heads/maintenance/gramps34
> [svn-remote "svn"]
> 	url = svn+ssh://jr...@sv.../p/gramps/code
> 	fetch = trunk:refs/remotes/trunk
> 	branches = branches/gramps35/*:refs/remotes/*
> 	branches = branches/geps/*:refs/remotes/geps/*
> 	branches = branches/maintenance/*:refs/remotes/maintenance/*
> 	tags = tags/*:refs/remotes/tags/*
>
> I also run a script that does
>    for foo in `git branch -r`; do
>      git update-refs ref/remotes/$foo:refs/remotes/origin/$foo
>    done
> after running git pull --rebase.
>
> Adding a per-branch fetch line to the svn-remote block is an interesting idea.
> ISTR that using a path in the branch names didn't work out for me when I tried
> it, but it seems that Pat LeFebvre got different results, and he's made most of
> the changes to the Wiki page.
>
Well, just about 24h ago, having written up the idea, I also did it and 
issued a "git svn fetch".
Somewhere along the night it stopped due to an SSH underlying connection 
failure, but I've restarted it in the morning.
Right now it seems still to be tracking the commits from the gramps 2.2 
era :-)

When it ends, I shall try the 3.4 commit again, and if everything works 
as expected, I'll update the wiki with my experiences.
I am looking forward to the time when this wiki becomes obsolete because 
the whole thing will be in git only, eliminating the git svn indexing 
wait...

Thank you so very much for having set up the git mirror!

V.