Git / Gitorious

Moderator: Heart

User avatar
julienV
Joomleague Core Developer
Joomleague Core Developer
Posts: 2016
Joined: Tue Jun 19, 2007 9:27 am
Location: France
Contact:

Git / Gitorious

Postby julienV » Sun Apr 04, 2010 3:03 pm

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
You can hire me, I'm a Joomla professional freelance developer.
Please contact me at jlv@jlv-solutions.com
NO PM, please use email !

User avatar
julienV
Joomleague Core Developer
Joomleague Core Developer
Posts: 2016
Joined: Tue Jun 19, 2007 9:27 am
Location: France
Contact:

Re:Git / Gitorious

Postby julienV » Mon Apr 05, 2010 10:18 am

up ! (can't bump it to post it....)

please READ: http://reinh.com/blog/2009/03/02/a-git- ... teams.html
You can hire me, I'm a Joomla professional freelance developer.
Please contact me at jlv@jlv-solutions.com
NO PM, please use email !

User avatar
timoline
Joomleague Core Developer, Donator
Joomleague Core Developer, Donator
Posts: 3331
Joined: Thu Mar 12, 2009 8:03 am
Contact:

Re:Git / Gitorious

Postby timoline » Mon Apr 05, 2010 11:36 am

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
Last edited by timoline on Mon Apr 05, 2010 11:49 am, edited 1 time in total.
Joomla 1.5.x
Joomleague 1.5.....latest git version

User avatar
svdoldie
.
Posts: 667
Joined: Fri Feb 16, 2007 7:34 pm
Joomleague version: 2.0.x
Contact:

Re:Git / Gitorious

Postby svdoldie » Mon Apr 05, 2010 11:50 am

Good idea  :)
SV Dörpum http://svdoerpum.de
Joomla 2.5.11
JL-2.x.x Komplettpaket von Diddi Poeler, mit vielen Verbesserungen und Erweiterungen zur Originalversion https://github.com/diddipoeler/joomleag ... plettpaket
Link zu Diddi's Seite: http://fussball in europa.de/index.php (Leerzeichen müssen entfernt werden)

User avatar
julienV
Joomleague Core Developer
Joomleague Core Developer
Posts: 2016
Joined: Tue Jun 19, 2007 9:27 am
Location: France
Contact:

Re:Git / Gitorious

Postby julienV » Mon Apr 05, 2010 1:40 pm

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...
You can hire me, I'm a Joomla professional freelance developer.
Please contact me at jlv@jlv-solutions.com
NO PM, please use email !

User avatar
timoline
Joomleague Core Developer, Donator
Joomleague Core Developer, Donator
Posts: 3331
Joined: Thu Mar 12, 2009 8:03 am
Contact:

Re:Git / Gitorious

Postby timoline » Mon Apr 05, 2010 5:04 pm

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?
Joomla 1.5.x
Joomleague 1.5.....latest git version

User avatar
julienV
Joomleague Core Developer
Joomleague Core Developer
Posts: 2016
Joined: Tue Jun 19, 2007 9:27 am
Location: France
Contact:

Re:Git / Gitorious

Postby julienV » Mon Apr 05, 2010 5:06 pm

sure, the svn is still here anyway...
You can hire me, I'm a Joomla professional freelance developer.
Please contact me at jlv@jlv-solutions.com
NO PM, please use email !

User avatar
teddy
.
Posts: 304
Joined: Wed Feb 28, 2007 12:01 pm

Re:Git / Gitorious

Postby teddy » Tue Apr 06, 2010 9:48 am

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?
Joomla 1.5.22
Joomleague 1.5.1

User avatar
julienV
Joomleague Core Developer
Joomleague Core Developer
Posts: 2016
Joined: Tue Jun 19, 2007 9:27 am
Location: France
Contact:

Re:Git / Gitorious

Postby julienV » Tue Apr 06, 2010 10:04 am

we are still evaluating the move to git...
You can hire me, I'm a Joomla professional freelance developer.
Please contact me at jlv@jlv-solutions.com
NO PM, please use email !

User avatar
timoline
Joomleague Core Developer, Donator
Joomleague Core Developer, Donator
Posts: 3331
Joined: Thu Mar 12, 2009 8:03 am
Contact:

Re:Git / Gitorious

Postby timoline » Tue Apr 06, 2010 10:18 am

Shall we use the wiki on Gitorious for dev wiki or user wiki?
Last edited by timoline on Tue Apr 06, 2010 10:25 am, edited 1 time in total.
Joomla 1.5.x
Joomleague 1.5.....latest git version

User avatar
teddy
.
Posts: 304
Joined: Wed Feb 28, 2007 12:01 pm

Re:Git / Gitorious

Postby teddy » Tue Apr 06, 2010 10:25 am

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...
Joomla 1.5.22
Joomleague 1.5.1

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Tue Apr 06, 2010 9:45 pm

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 :)
http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Tue Apr 06, 2010 9:51 pm

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!!!
http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Tue Apr 06, 2010 9:52 pm

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 :)
http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a

User avatar
timoline
Joomleague Core Developer, Donator
Joomleague Core Developer, Donator
Posts: 3331
Joined: Thu Mar 12, 2009 8:03 am
Contact:

Re:Git / Gitorious

Postby timoline » Wed Apr 07, 2010 10:13 am

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 :)
Joomla 1.5.x
Joomleague 1.5.....latest git version

And_One
Joomleague Project Manager, Donator
Joomleague Project Manager, Donator
Posts: 3609
Joined: Fri Sep 11, 2009 4:00 pm
Joomleague version: 2.0.x
Location: Graz
Contact:

Re:Git / Gitorious

Postby And_One » Wed Apr 07, 2010 8:58 pm

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.
Joomla 1.5.x
Joomleague 1.6 Final
Working on Joomleague 2.0
[url=http://forum.joomleague.net/viewforum.php?f=109]Joomleague 1.6 Extended Data Editor[/url]
[url=https://opentranslators.transifex.com]
[img]https://ds0k0en9abmn1.cloudfront.net/static/widgets/images/transifex-userbar.1d82cbde2ade.png[/img]
[/url]

User avatar
julienV
Joomleague Core Developer
Joomleague Core Developer
Posts: 2016
Joined: Tue Jun 19, 2007 9:27 am
Location: France
Contact:

Re:Git / Gitorious

Postby julienV » Mon Apr 12, 2010 3:58 pm

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.
You can hire me, I'm a Joomla professional freelance developer.
Please contact me at jlv@jlv-solutions.com
NO PM, please use email !

User avatar
julienV
Joomleague Core Developer
Joomleague Core Developer
Posts: 2016
Joined: Tue Jun 19, 2007 9:27 am
Location: France
Contact:

Re:Git / Gitorious

Postby julienV » Mon Apr 12, 2010 4:55 pm

i was just playing with it, it's still there ;)
You can hire me, I'm a Joomla professional freelance developer.
Please contact me at jlv@jlv-solutions.com
NO PM, please use email !

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Mon Apr 12, 2010 4:57 pm

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 :)
http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a

User avatar
julienV
Joomleague Core Developer
Joomleague Core Developer
Posts: 2016
Joined: Tue Jun 19, 2007 9:27 am
Location: France
Contact:

Re:Git / Gitorious

Postby julienV » Mon Apr 12, 2010 5:07 pm

really ?
You can hire me, I'm a Joomla professional freelance developer.
Please contact me at jlv@jlv-solutions.com
NO PM, please use email !

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Mon Apr 12, 2010 5:10 pm

Yes really... Neighter by anonyous nor by username and password as it worked before  :D
http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a

User avatar
timoline
Joomleague Core Developer, Donator
Joomleague Core Developer, Donator
Posts: 3331
Joined: Thu Mar 12, 2009 8:03 am
Contact:

Re:Git / Gitorious

Postby timoline » Mon Apr 12, 2010 5:15 pm

julienV wrote:really ?

yup
Joomla 1.5.x
Joomleague 1.5.....latest git version

User avatar
julienV
Joomleague Core Developer
Joomleague Core Developer
Posts: 2016
Joined: Tue Jun 19, 2007 9:27 am
Location: France
Contact:

Re:Git / Gitorious

Postby julienV » Mon Apr 12, 2010 5:18 pm

just did it (as anonymous: svn checkout http://joomlacode.org/svn/joomleague ) and it worked... strange
You can hire me, I'm a Joomla professional freelance developer.
Please contact me at jlv@jlv-solutions.com
NO PM, please use email !

User avatar
timoline
Joomleague Core Developer, Donator
Joomleague Core Developer, Donator
Posts: 3331
Joined: Thu Mar 12, 2009 8:03 am
Contact:

Re:Git / Gitorious

Postby timoline » Mon Apr 12, 2010 5:20 pm

julienV wrote:just did it (as anonymous: svn checkout http://joomlacode.org/svn/joomleague ) and it worked... strange

now it works again :)
Joomla 1.5.x
Joomleague 1.5.....latest git version

User avatar
teddy
.
Posts: 304
Joined: Wed Feb 28, 2007 12:01 pm

Re:Git / Gitorious

Postby teddy » Mon Apr 12, 2010 5:24 pm

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...
Joomla 1.5.22
Joomleague 1.5.1

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Mon Apr 12, 2010 5:27 pm

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:
http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Mon Apr 12, 2010 5:34 pm

julienV wrote:just did it (as anonymous: svn checkout http://joomlacode.org/svn/joomleague ) and it worked... strange


Works for me again  :cool:
http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a

User avatar
timoline
Joomleague Core Developer, Donator
Joomleague Core Developer, Donator
Posts: 3331
Joined: Thu Mar 12, 2009 8:03 am
Contact:

Re:Git / Gitorious

Postby timoline » Mon Apr 12, 2010 5:37 pm

But,

lets close svn now... :)

the merge between svn and git is done
Joomla 1.5.x
Joomleague 1.5.....latest git version

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Mon Apr 12, 2010 5:39 pm

timoline wrote:But,

lets close svn now... :)

the merge between svn and git is done


But please after we have the Handout of mindh4nt3r!!!
http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Mon Apr 12, 2010 5:41 pm

Just read the message of teddy  :whistling:
http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a


Return to “German”

Who is online

Users browsing this forum: No registered users and 1 guest

cron