@riq, cool - sounds great. So we should wait for 'cocos2d-iphone' user before forking :)
[devel] Migration to mercurial
(48 posts) (14 voices)-
Posted 2 years ago #
-
done:
trunk and tags were migrated to github:
http://github.com/cocos2d/cocos2d-iphoneTODO: migrate the issue tracker
I'll continue to maintain the SVN repo for a few days/weeks until I feel comfortable with git/github.
Posted 2 years ago # -
Oh, that is so awesome - thanks SO much for this, riq. I can't wait to see this grow!
Cheers,
Stu
Posted 2 years ago # -
You can use markdown for your README file (rename to README.mdown), it should show up formatted already, since you follow basically the same conventions.
Textmate has a great bundle for viewing your text with markdown rendered, so you can see what your file looks like.
Cheers,
Stu
Posted 2 years ago # -
Just forked, and as an example, I updated the README:
http://github.com/scarnie/cocos2d-iphone
Notice, it's nicely formatted, but the textual version is basically identical :)
Cheers,
Stu
Posted 2 years ago # -
I'm in the process of learning git, so I might break something during these days :P
Workflow:
I created thedevelopmentbranch. New patches will be merged in this branch. After I tested them, I'll merge them in themasterbranch.The idea is that
masterwill contain sort of stable code... It will compile, and 95% of the features should work, whiledevelopmentmight not compile, or might break some important features.What do you think of this new workflow ?
@stu: I merged your repo in
development.Posted 2 years ago # -
I wondered why I hadn't seen many commits lately. =) For those of us new to git, are there any good resources out there for the paradigm change? I'll probably need them because I'm a 10+ year CVS/SVN user.
@riq, hoping that this makes your job easier for merges and such!
Posted 2 years ago # -
@slycrel: I'm new to git too :)
Try this tutorial: http://git.or.cz/course/svn.htmlwhat I like about git is that it encourages people to fork->modify->submit-patches->merge->fork... And the merge is really simple, and forking seems to be very cheap.
Posted 2 years ago # -
Branching is a key feature (and extremely cheap) in Git. You should always branch if you are going to experiment with an idea, as you can easily revert back and try different ideas. Git very much encourages this workflow..
git checkout -b mygreatnewideaPlay around and if you don't like it, switch back to master and delete the branch OR merge your greatnewidea back in to master.
I've already gone wild with my fork :) I've added file templates, created my plblocks branch for those to try, and merged riq's latest changes all very easily.
My fork is here if you are interested.
Cheers,
Stu
Posted 2 years ago # -
@stu: do you have the plblock support commited in your branch ? if not, let me know when you have it. I'll merge it in
development.I tried to apply the patch that you posted in the issue tracker, but it is raising some conflicts... so, I prefer to merge it from a git branch :)
Also, do you receive a message when I merge your changes ? If not, who do I notify a user (automatically if possible) when I merge its branch ? thanks.
Posted 2 years ago # -
After reading this article: http://nvie.com/git-model
I'm going to rename thedevelopmentbranch todevelop, because it is shorter and because it is a common practice in git (???)Posted 2 years ago # -
@riq, glad you found plblocks - git is awesome for this stuff, eh? So much easier! I also saw you moved the file templates - very good - I've merged into my repository.
Did you delete your local branch named 'development'? To clean up your Github repository, you can delete your remote branch as follows:
git push origin :developmentThe colon ':' in front of a ref name 'development' will delete from the remote repository it rather than push it
Cheers,
Stu
Posted 2 years ago # -
is there everything ok with heads? cos i see like 30 heads in your git repo.
edit: ah, you tagged every version.
Posted 2 years ago # -
@stu Sorry for the late post, was out for a few days. I'll check out that fork of GitX, thanks for the pointer. I did try GitY, but I really prefer the command line to a full on GUI for git, so IMO, it isn't worth checking out past what you've already seen. As you probably know, the only reason I like GitX is for it's hunk committing, when changes in a single file belong in different commits. The git command line is ok for that, but GitX makes it sooooo much faster. I will definitely check out the fork you mentioned!
Posted 2 years ago # -
@riq
Did you disable ticket tracking? Need the issue tracker on Github too :)
Posted 2 years ago #
Reply
You must log in to post.