Yii Framework Forum: Yii moved to GitHub - Yii Framework Forum

Jump to content

  • (3 Pages)
  • +
  • 1
  • 2
  • 3
  • You cannot start a new topic
  • You cannot reply to this topic

Yii moved to GitHub Rate Topic: ***** 1 Votes

#1 User is offline   wei 

  • Advanced Member
  • Yii
  • Group: Yii Dev Team
  • Posts: 147
  • Joined: 04-October 08

Posted 15 February 2012 - 08:20 PM

*
POPULAR

It's official now: Yii is on GitHub! We also switched to use GitHub issue tracker. Existing issues have already been imported into it.

Many users have requested for this, and we think it's a wise move to put Yii on GitHub to encourage more people to participate in developing Yii.

SVN users, do not worry. We will still keep our SVN repository. A synchronization between our git repository and svn repository will be done nightly.

Please let us know if you encounter any issues. Thank you for your support!
7

#2 User is offline   yiqing95 

  • Advanced Member
  • PipPipPip
  • Yii
  • Group: Members
  • Posts: 585
  • Joined: 27-December 10
  • Location:china

Posted 15 February 2012 - 08:33 PM

glad to hear that :lol:
0

#3 User is offline   kahwee 

  • Newbie
  • Yii
  • Group: Members
  • Posts: 1
  • Joined: 26-November 10

Posted 15 February 2012 - 11:52 PM

Great news ;D
0

#4 User is offline   jacmoe 

  • Elite Member
  • Yii
  • Group: Moderators
  • Posts: 2,601
  • Joined: 10-October 10
  • Location:Denmark

Posted 16 February 2012 - 12:15 AM

A bit late - the announcement I mean - but great none the less! Posted Image

Let the forking commence!!
"Less noise - more signal"
0

#5 User is offline   chnax 

  • Newbie
  • Yii
  • Group: Members
  • Posts: 3
  • Joined: 05-November 11

Posted 16 February 2012 - 08:27 AM

I think this is a good move.

Previously I had my own git-clone of the svn-repository and there are some differences that make me wonder how you keep git and svn in sync.

1) with git svn clone I get a reference to the svn commit (like git-svn-id: ... trunk@3568 ...) this Info is not present in github.
Maybe not needed that badly, but otherwise it does not hurt to have it there ... so I wonder why it was removed.

2) you make some effort to place the version tags outside the master branch. why? This way `git describe` does not provide usefull information.
I think "1.1.10-3-g032224e" (3 commits after 1.1.10 release) would be much more usefull than "heads/master".
0

#6 User is offline   PoL 

  • Advanced Member
  • PipPipPip
  • Yii
  • Group: Members
  • Posts: 506
  • Joined: 05-November 08
  • Location:Buenos Aires, Argentina

Posted 16 February 2012 - 08:31 AM

This is great.. and I'm pretty sure this will increase the number of people inteseted in Yii... valuable contribution will begin very soon (if not started yet)
Don't say what you think, think what you say
The problem is communication! Excess of communication!
0

#7 User is offline   choiceerp 

  • Newbie
  • Yii
  • Group: Members
  • Posts: 18
  • Joined: 24-April 10
  • Location:EUROPA - France - Paris

Posted 17 February 2012 - 11:45 AM

Very good idea to put it also in git :D

Just one thing, it was good to tag version in git also ::)
knowledge is valid only if it is shared ;-)
0

#8 User is offline   CeBe 

  • Advanced Member
  • Yii
  • Group: Yii Dev Team
  • Posts: 357
  • Joined: 16-July 10
  • Location:Berlin. Germany

Posted 17 February 2012 - 12:55 PM

Its great to see yii community exploring github. Now since it is very easy to provide a fix with pull requests Yii can grow much faster I think.
I am amazed, how many pull requests, forks and watches we have within one day. With github you get a feeling about whats going on in the community ::)

At the moment of I am writing this post we have 23 pull requests, 318 watchers and 51 forks!


btw @chnax I reported an issue about the tags: https://github.com/y.../yii/issues/360
0

#9 User is offline   Da:Sourcerer 

  • Master Member
  • PipPipPipPip
  • Yii
  • Group: Members
  • Posts: 1,162
  • Joined: 30-March 11
  • Location:Berlin, Germany

Posted 17 February 2012 - 02:33 PM

CeBe: Since you seem to be proficient with git/github: I'm currently creating a branch for every patch I'd like to submit via a pull request. Is that the right way to do? I fear to taint my pull requests with unrelated commits :mellow:
programmer /ˈprəʊgramə/, noun: a device that converts ►coffee into ►code
0

#10 User is offline   phpnode 

  • Standard Member
  • PipPip
  • Yii
  • Group: Members
  • Posts: 141
  • Joined: 18-April 11

Posted 17 February 2012 - 03:47 PM

I added a wiki page that outlines the workflow for git contributors, if you have any further questions please post them here and i'll try and add the answers to the wiki page:

https://github.com/y...ii-contributors
3

#11 User is offline   Da:Sourcerer 

  • Master Member
  • PipPipPipPip
  • Yii
  • Group: Members
  • Posts: 1,162
  • Joined: 30-March 11
  • Location:Berlin, Germany

Posted 17 February 2012 - 04:35 PM

Is it such a good idea to put this into the github wiki? After all, we've already got two bugtrackers now.
programmer /ˈprəʊgramə/, noun: a device that converts ►coffee into ►code
0

#12 User is offline   phpnode 

  • Standard Member
  • PipPip
  • Yii
  • Group: Members
  • Posts: 141
  • Joined: 18-April 11

Posted 17 February 2012 - 05:09 PM

It's there because it directly relates to git/github and it makes sense to have this info there, other stuff should go in the normal Yii wiki
0

#13 User is offline   Da:Sourcerer 

  • Master Member
  • PipPipPipPip
  • Yii
  • Group: Members
  • Posts: 1,162
  • Joined: 30-March 11
  • Location:Berlin, Germany

Posted 17 February 2012 - 05:37 PM

Okay, makes sense.
programmer /ˈprəʊgramə/, noun: a device that converts ►coffee into ►code
0

#14 User is offline   CeBe 

  • Advanced Member
  • Yii
  • Group: Yii Dev Team
  • Posts: 357
  • Joined: 16-July 10
  • Location:Berlin. Germany

Posted 18 February 2012 - 08:53 AM

View PostDa:Sourcerer, on 17 February 2012 - 02:33 PM, said:

CeBe: Since you seem to be proficient with git/github: I'm currently creating a branch for every patch I'd like to submit via a pull request. Is that the right way to do? I fear to taint my pull requests with unrelated commits :mellow:

Yes it is definitively the right way, you should not commit anything to master since you would not be able to get new changes from upstream repository without creating unneccessary merge commits and spoil the history.
I also noticed that you did something like rebasing with your master branch, so there are commits authored by other people and committed by you. You should not use your master branch for creating branches for pull requests anymore.
Since github does not allow you to change history, I am afraid there is no way to fix this.

View PostDa:Sourcerer, on 17 February 2012 - 04:35 PM, said:

[...]After all, we've already got two bugtrackers now.

Google code bugtracker is deprecated, we only have github as the bugtracker now.
1

#15 User is offline   Da:Sourcerer 

  • Master Member
  • PipPipPipPip
  • Yii
  • Group: Members
  • Posts: 1,162
  • Joined: 30-March 11
  • Location:Berlin, Germany

Posted 18 February 2012 - 09:51 AM

View PostCeBe, on 18 February 2012 - 08:53 AM, said:

I also noticed that you did something like rebasing with your master branch, so there are commits authored by other people and committed by you. You should not use your master branch for creating branches for pull requests anymore.
Since github does not allow you to change history, I am afraid there is no way to fix this.

What? I was trying to keep my fork in sync with upstream, that's all :huh:

Well, fits quite well with the rest: Something must have broken so fundamentaly that I am no longer able to push to my very own branches.
programmer /ˈprəʊgramə/, noun: a device that converts ►coffee into ►code
0

#16 User is offline   samdark 

  • Having fun
  • Yii
  • Group: Yii Dev Team
  • Posts: 3,126
  • Joined: 17-January 09
  • Location:Russia

Posted 18 February 2012 - 12:03 PM

Here's the workflow: https://github.com/y...ii-contributors
Yii 1.1 Application Development Cookbook

Enjoying Yii? Star us at github: 1.1 and 2.0.
0

#17 User is offline   musterknabe 

  • Newbie
  • Yii
  • Group: Members
  • Posts: 5
  • Joined: 27-April 10

Posted 18 February 2012 - 02:03 PM

What to do if a pull request is rather long lived. Should changes from upstream be merged after opening a pull request to resolve possible conflicts?
0

#18 User is offline   phpnode 

  • Standard Member
  • PipPip
  • Yii
  • Group: Members
  • Posts: 141
  • Joined: 18-April 11

Posted 18 February 2012 - 02:28 PM

You should pull upstream before every push to github. As long as there are no merge conflicts before you open or update your pull request, you've done your job. If a long time passes because of discussion a member of the Yii team should attempt to resolve the merge conflicts themselves, if the merge is particularly tricky they will ask for your help. Of course you can be proactive about this and if you notice conflicts while a pull request is open, you can make the Yii team's life easier by resolving them yourself.
0

#19 User is offline   Da:Sourcerer 

  • Master Member
  • PipPipPipPip
  • Yii
  • Group: Members
  • Posts: 1,162
  • Joined: 30-March 11
  • Location:Berlin, Germany

Posted 18 February 2012 - 02:31 PM

View Postsamdark, on 18 February 2012 - 12:03 PM, said:


Seen that. Unfortunately I can no longer follow this as my local git gave up on me. I can commit changes, but that will kick me out of my branch. Anyway, I think I hit my "damn you git!"-quota for this week. I'll check back with this next wednesday.

In the meantime, this is an interesting read concerning hg vs git: http://importantshoc...t-vs-mercurial/
programmer /ˈprəʊgramə/, noun: a device that converts ►coffee into ►code
0

#20 User is offline   drx 

  • Newbie
  • Yii
  • Group: Members
  • Posts: 15
  • Joined: 23-October 09

Posted 19 February 2012 - 04:48 PM

Good decision. This will speed up contributing a lot.
0

Share this topic:


  • (3 Pages)
  • +
  • 1
  • 2
  • 3
  • You cannot start a new topic
  • You cannot reply to this topic

1 User(s) are reading this topic
0 members, 1 guests, 0 anonymous users