Page 1 of 7

Git / Gitorious

Posted: Sun Apr 04, 2010 3:03 pm
by julienV
Please do not perform your git tests directly in the main branch...

what you can do is clone the repo from gitorious (http://gitorious.org/joomleague/joomleague, clone link on the right panel), then do your stuff. Once you are finish with testing, you can delete your test clone repository, or merge it you did something meaningfull.

Please feel free to share your interesting findings, frustration, etc...

Links
git for windows with tortoise: http://code.google.com/p/tortoisegit/downloads/list
or http://code.google.com/p/msysgit/downloads/list

good reads:
how to create a ssh key: http://gitorious.org/about/faq
http://dbanck.de/2009/10/08/github-wind ... g-pulling/

very good read: http://reinh.com/blog/2009/03/02/a-git- ... teams.html

http://opensimulator.org/wiki/Using_Git

Re:Git / Gitorious

Posted: Mon Apr 05, 2010 10:18 am
by julienV
up ! (can't bump it to post it....)

please READ: http://reinh.com/blog/2009/03/02/a-git- ... teams.html

Re:Git / Gitorious

Posted: Mon Apr 05, 2010 11:36 am
by timoline
Dont know what the other devs think about this,
but may I suggest that we still work with SVN.?

SVN is not so complicated like git... >:D, I'm trying to understand it, but its not that easy...


edit:I see Kurt is still working on SVN

Re:Git / Gitorious

Posted: Mon Apr 05, 2010 11:50 am
by svdoldie
Good idea  :)

Re:Git / Gitorious

Posted: Mon Apr 05, 2010 1:40 pm
by julienV
I'd say we should give a shot to git, but if nobody wants to dig into that, nevermind.

I explained why i think it's better, but of course, it's something new to learn...

Re:Git / Gitorious

Posted: Mon Apr 05, 2010 5:04 pm
by timoline
Of course I will give it a try,  >:D

So we all agree to try git for a while?

P.s. Can we go back to svn....if there are to much problems?

Re:Git / Gitorious

Posted: Mon Apr 05, 2010 5:06 pm
by julienV
sure, the svn is still here anyway...

Re:Git / Gitorious

Posted: Tue Apr 06, 2010 9:48 am
by teddy
I'm trying to understand something in the end:
90% of devs have switched to git
Kurt, who is working on massive reworks of important functions still works on svn
Should I merge the two repositories? Should I wait for things to cool down?
Which one is the correct version to refer to? svn or git?

Re:Git / Gitorious

Posted: Tue Apr 06, 2010 10:04 am
by julienV
we are still evaluating the move to git...

Re:Git / Gitorious

Posted: Tue Apr 06, 2010 10:18 am
by timoline
Shall we use the wiki on Gitorious for dev wiki or user wiki?

Re:Git / Gitorious

Posted: Tue Apr 06, 2010 10:25 am
by teddy
julienV wrote:we are still evaluating the move to git...

Ok then, I will go on testing SVN version and I hope all bug hunting will refer to that one...

Re:Git / Gitorious

Posted: Tue Apr 06, 2010 9:45 pm
by Kurt
julienV wrote:I'd say we should give a shot to git, but if nobody wants to dig into that, nevermind.

I explained why i think it's better, but of course, it's something new to learn...


With help of Timoline and Kevin I also tried it and also commited and merged using the way to make a clone for myself before.
Must say that it's a little bit complicated rathr than svn if you are not used to but I think it is a question of practice.

But I think we need some kind of rules that commited code on clones have to be checked before merge to master. So this would mean we need a clone checker or merge request checker. It has to be someone who is really good freind with the JL source and has nothing else to do than to check the merge-rquests. As long as that is not 100% guareneed we could also stay on svn as it makes no change ;) But ask Timoline for more  >:D cause I will be absent till Friday :)

Re:Git / Gitorious

Posted: Tue Apr 06, 2010 9:51 pm
by Kurt
Btw... Even though I see the positive parts of git I WILL try to commit at least my own changes on the JL-code to svn and git both. As long as I am not really familar with git I don't want to loose my changes on the code!!!

Re:Git / Gitorious

Posted: Tue Apr 06, 2010 9:52 pm
by Kurt
teddy wrote:I'm trying to understand something in the end:
90% of devs have switched to git
Kurt, who is working on massive reworks of important functions still works on svn
Should I merge the two repositories? Should I wait for things to cool down?
Which one is the correct version to refer to? svn or git?


I also sent my changes to git which I've sent to svn :)

I hope that I din't forgot something ;)

But I think we can make a general merge after we decided which one to use in the future :)

Re:Git / Gitorious

Posted: Wed Apr 07, 2010 10:13 am
by timoline
Kurt wrote:
julienV wrote:I'd say we should give a shot to git, but if nobody wants to dig into that, nevermind.

I explained why i think it's better, but of course, it's something new to learn...


With help of Timoline and Kevin I also tried it and also commited and merged using the way to make a clone for myself before.
Must say that it's a little bit complicated rathr than svn if you are not used to but I think it is a question of practice.

But I think we need some kind of rules that commited code on clones have to be checked before merge to master. So this would mean we need a clone checker or merge request checker. It has to be someone who is really good freind with the JL source and has nothing else to do than to check the merge-rquests. As long as that is not 100% guareneed we could also stay on svn as it makes no change ;) But ask Timoline for more  >:D cause I will be absent till Friday :)


Well I must agree this :)

Re:Git / Gitorious

Posted: Wed Apr 07, 2010 8:58 pm
by And_One
i have to say it just for me, and let it everyone know here, i wont use joomlacode + tracker + svn anymore. i am happy with git and the multibranch / request for merge system.

Re:Git / Gitorious

Posted: Mon Apr 12, 2010 3:58 pm
by julienV
it seems to me that the gitorious project seems to be working well ! Should i point joomlacode to it rather than the svn repo ? there is an option for git...

If you have time, i advised you to read a bit about interactive rebasing, so that you can group fragmented commits that go together into the same commit before merging to the main branch.
To keep this clean, you have to create branch per 'feature/bug fix/etc...' inside your clone, so that once it has been merged into main repo, you can delete the branch.

Re:Git / Gitorious

Posted: Mon Apr 12, 2010 4:55 pm
by julienV
i was just playing with it, it's still there ;)

Re:Git / Gitorious

Posted: Mon Apr 12, 2010 4:57 pm
by Kurt
julienV wrote:i was just playing with it, it's still there ;)



Hope it works as before as I don't seem to have acces at the moment :)

Re:Git / Gitorious

Posted: Mon Apr 12, 2010 5:07 pm
by julienV
really ?

Re:Git / Gitorious

Posted: Mon Apr 12, 2010 5:10 pm
by Kurt
Yes really... Neighter by anonyous nor by username and password as it worked before  :D

Re:Git / Gitorious

Posted: Mon Apr 12, 2010 5:15 pm
by timoline
julienV wrote:really ?

yup

Re:Git / Gitorious

Posted: Mon Apr 12, 2010 5:18 pm
by julienV
just did it (as anonymous: svn checkout http://joomlacode.org/svn/joomleague ) and it worked... strange

Re:Git / Gitorious

Posted: Mon Apr 12, 2010 5:20 pm
by timoline
julienV wrote:just did it (as anonymous: svn checkout http://joomlacode.org/svn/joomleague ) and it worked... strange

now it works again :)

Re:Git / Gitorious

Posted: Mon Apr 12, 2010 5:24 pm
by teddy
During the last week I've installed Git bash/GUI on 2 different PCs and have followed a few tutorials on the web. Without success, I'd say. Which means I've not been able to work on the italian localization finalization I'd like to start (sorry, I'm not a dev, and neither tech savvy enough it seems). Perhaps any of you could replicate Kurt's tutorial on this thread?
http://www.joomleague.de/forum/index.ph ... 698.0.html
It would be very kind and useful...

Re:Git / Gitorious

Posted: Mon Apr 12, 2010 5:27 pm
by Kurt
teddy wrote:During the last week I've installed Git bash/GUI on 2 different PCs and have followed a few tutorials on the web. Without success, I'd say. Which means I've not been able to work on the italian localization finalization I'd like to start (sorry, I'm not a dev, and neither tech savvy enough it seems). Perhaps any of you could replicate Kurt's tutorial on this thread?
http://www.joomleague.de/forum/index.ph ... 698.0.html
It would be very kind and useful...


mindh4nt3r is working on this and we will get that the next days so even dummies like me are able to use git (which really seems to be better than svn)

Thanks to mindh4nt3r  :cool:

Re:Git / Gitorious

Posted: Mon Apr 12, 2010 5:34 pm
by Kurt
julienV wrote:just did it (as anonymous: svn checkout http://joomlacode.org/svn/joomleague ) and it worked... strange


Works for me again  :cool:

Re:Git / Gitorious

Posted: Mon Apr 12, 2010 5:37 pm
by timoline
But,

lets close svn now... :)

the merge between svn and git is done

Re:Git / Gitorious

Posted: Mon Apr 12, 2010 5:39 pm
by Kurt
timoline wrote:But,

lets close svn now... :)

the merge between svn and git is done


But please after we have the Handout of mindh4nt3r!!!

Re:Git / Gitorious

Posted: Mon Apr 12, 2010 5:41 pm
by Kurt
Just read the message of teddy  :whistling: