Re: [Swig-devel] Git and github

[William S F. <ws...@fu...>]

On 07/12/12 01:47, Alexey Sokolov wrote:
> 07.12.2012 03:54, Vadim Zeitlin пишет:
>> On Thu, 06 Dec 2012 20:19:51 +0000 William S Fulton<ws...@fu...>  wrote:
>>
>> WSF> Actually the workflow for distributed systems is still a bit foreign to
>> WSF> me. I can understand pull requests for occasional contributors, but
>> WSF> don't really understand what happens for regular contributors. Do the
>> WSF> regular contributors all get write access to master, or are there some
>> WSF> other workflow patterns that we can consider?
>>
>>   Hi,
>>
>>   Actually I'm the wrong person to ask as it's up to you, as the maintainer
>> of the project, to decide how do you want it to work. The main difference
>> with svn is that you practically must give people write access to the main
>> repository itself with svn as the only other possibility is to submit
>> patches for every change and svn doesn't even make it simple to apply
>> multiple patches. With git you have more choice. Of course, if you want,
>> you can ignore the new possibilities and just continue to let people to
>> push directly to the main repository. But you can also *easily* (this is
>> the important part, it's not just some theoretical possibility but a nice
>> way to work in practice) ask people to submit pull requests to you and then
>> merge them yourself as you see fit. And, of course, there are intermediate
>> possibilities, e.g. you can let people responsible for some particular
>> languages push directly but merge changes from others yourself. The bottom
>> line is that you should choose whatever seems the best to you and it will
>> still be simple for the others to contribute in any case.
>>
Thanks for this. I don't really want to be merging all the commits. I 
think we should give the current regular svn trunk committers write 
access to the main git repository. There aren't that many atm though! 
Then anyone else can submit pull requests and we can add additional 
write access as and when necessary.

>>
>> WSF> > I do already have a git-svn clone with all the branches
>> WSF> > locally too, so I could push it out there whenever you want.
>> WSF> And that is the one with all the email addresses associated with SF
>> WSF> users when you ported it over?
>>
>>   I was actually sure it was but it turns out that it isn't, somehow... I
>> must have only wanted to start a new git-svn clone but never did. I do have
>> a relatively complete authors file (64 entries) so I could redo a new svn
>> import, but it will take some time (~20 hours I think).
I think mine completed overnight when I did it 6 months ago, so it could 
be a bit quicker.

>>
>> WSF> If this git-svn clone is up to date with all the branches in svn, then
>> WSF> you've done a lot of the hard work, so we definitely could use that. I
>> WSF> suppose it has additional branches in it too?
>>
>>   Yes, it does have all the branches. I probably can do git fast-export,
>> fix the author names, and fast-import to obtain the correct repository
>> (at least this seems simpler than doing filter-branch for all branches to
>> me, does anybody know a better way?).
>>
>> WSF> I'd like to release 2.0.9 in a few days and then switch to github. Are
>> WSF> you around this month to help?
>>
>>   I won't have much time but I'll be there to help in case of some problem.
>> Normally it shouldn't take long time to simply get the repo up and running
>> on Github. Just please let me know when should I push it out there.
>
> Just FYI, according to https://github.com/vadz/swig/network your clone
> has few commits of 23 March missing for some reason...
>
Sounds like if we do a new svn import it'll fix any missing commits and 
make the authors setup easier. I'm quite happy to do that if Vadim can 
send me the author's list. My only question is will it make it hard for 
the current git clones to resync to the new repo? I've no idea how 
independent git clones of the svn repo will work together... won't they 
have different git ids for the same svn commits? Oliver, have you any 
thoughts for your clone?

>> WSF> Not many folk look at or use the www area in the svn repository -
>> WSF>https://swig.svn.sourceforge.net/svnroot/swig/www, but it basically
>> WSF> contains the website and is updated with the latest docs on each
>> WSF> release. Suggestions for this... put it into a separate git repo?
>>
>>   I think so, yes. At least I don't see any advantage in integrating it with
>> the sources repo.
Okay, I'll do that then.

William