A fast, easy to use, free, and community supported 2D game engine
Hi,
as you know the source code of cocos2d-iphone is hosted on Goole Code. In Google Code you can choose between SVN or Mercurial.
Mercurial is like Git and baazar, a distributed revision control.
And I was thinking of migrating to Mercurial because it is easier to merge patches.
Anyone in favor or against this migration ? Please, explain your reasons. Thanks.
Info about mercurial:
http://hginit.com/
http://code.google.com/p/support/wiki/ConvertingSvnToHg
cjl
Member
I'm a newbie with Hg, but I like it so far, so it would make me happy if you migrated. I'm guess I'm lucky in that I've never used any revision control software before trying Hg, so I don't have any biases.
However, it seems that maybe Hg (and Git) don't handle binary files all the elegantly. Could this be a problem? I don't know, I'm just throwing it out there.
cjl
Member
@lam
Nothing bad happens to binary files. I think that the diff algorithm doesn't handle binary files well in the sense that instead of storing changes (like it does with source code) it has to store complete copies. So, if you make a small change to a large binary file, you don't get a small changeset, you get a new complete copy. Or so I'm led to understand. In theory this could cause your repo to grow pretty large very quickly.
Both GIT and Hg are working on improved ways to handle binary file changes.
Since you are throwing out options, any thoughts on migrating to Git? GitHub has gained significant traction, and is one of the premier social coding portals. GitHub is geared towards people forking the project and creating a network - I really think we'd see significant growth of cocos2d on GitHub. I read a tweet that Erlang saw a 5x increase in outside contributions since moving to GitHub.
What about issue tracking?
Binary files - yes!
See this in Pro Git
What about Git resources?
Here are some great links to get started with git:
Just my 2ยข, anyhow :)
Cheers,
Stu
Steve Oldmeadow
Administrator
The arguments in the "Git vs X" article are pretty compelling. If we are going to have to learn a new VCS git sounds like a good choice.
However, @Riq - I'm guessing you do 99% of the merges so I'm happy to use whatever will save you time.
If you newer worked with mercurial before it will be hard at beginning because it has different philosophy then svn, but it really worth it.
CJ: there is no difference to use git or mercurial - basically its just names - they are both compatible and there is tons of bridges. For using git in mercurial you only have to add "hggit=" to .hgrc and you can work with git repository as mercurial one. So git vs mercurial only flame question :)
+1 for mercurial
I've never used github yet, so I almost know nothing about it.
What are the main advantages of github comparing the other services like google code, launchpad, etc ? Thanks.
@riq I recommend CodaSet it's a new service and something I've used since it was in early beta. It's the best project hosting service I've found bar none. And free for open source as well:
http://codaset.com
@CJ: Thanks, and what are the advantages, in your opinion, comparing to the others services like google code, launchpad, etc ?
I also prefer Git. It's simple, intuitive, and really becoming prevalent. I use it locally for all of my projects, and also version control my assets with it along with my code. I prefer using command-line Git vs. SVN/SVN frontends, which I find overly complicated. I haven't used Mercurial. I didn't want to mention Git unless others did, since people who commit often should have the louder voice on this one prob.
+1 for git && github
There's even a script to migrate issues from google code to github:
http://remediecode.org/2009/04/moved-issues-to-github.html
github is very good for collaborative efforts. The issue tracking is really simple, but with a clever usage of labels (tags) you can have something pretty decent.
one of the things I like a lot about github:
* pages hosting: you can host the auto-generated documentation
* close issues from commits
* easy import from svn (you can even import the whole svn history, including branches)
* nice (really nice!) network graphics: how many forks/branches, when they were merged, etc.
* also very nice branch-comparison reports
* easy to manage
* includes wiki
the rest of the advantages are related to the usage of git: great for merge, fast as hell, easy to patch/ammed/delete commits, etc...
my USD$0.02
r
@riq
About codaset (What I think)
PROS
* It is new (less than a year old) which means it is actively developed and has a growing community.
* It uses Git
* Completely free for open source projects
* Project management is superior to git and google code (tickets, workflows, etc...)
* Website is clean and has a good UI design.
CONS
* It is new (less than a year old) which may be a deterrent.
* It uses Git (maybe you like something else)
About codaset (From their website)
Codaset is a project management system for open source and private software projects, built around the Git source control system. It is designed to be useful, social, and to take the best of what is good about other services, and place that goodness into one nice, neat package.
MANAGE
Codaset is a project management system for open source and private software projects, built around the Git source control system. It is designed to be useful, social, and to take the best of what is good about other services, and place that goodness into one nice, neat package.
* Software Project management
* Built by developers, for developers
* Public and private projects
* Public projects are free
* First private project is free
CODING
We are powered by the open source, distributed version control system; Git, which means managing your code is easier than ever. It's also the perfect way to watch and fork your favourite open source projects. Codaset provides a powerful, but simple user interface to view your version history and code.
* Distributed source control
* Source code browser
* Integrated code review
* Comment on any commit
* Full commit history
SOCIAL
Codaset enables social networking for your open source projects. Watch as the community creates their own forks of your software, and contributes back to you. View a project's activity feed, then bookmark your favourite. See who's following you and your projects, and track who has forked your source.
* Easily fork any project
* Full project activity feeds
* Book favourite projects
* Connect with other developers
WORKFLOW
Create your very own personalised workflow for each of your projects. Codaset provides a set of unique tools to let you define the way you work; create unique states for your tickets, with a defined set of following states, which will help you manage your tickets and issues much more effectively.
* Advanced workflow tools
* Each project can be unique
* Create custom ticket states
* Define your own ticket workflow
TICKETS
A full featured issue management system is now at your fingertips, and is fully integrated into your source control. Even lets you manage your tickets via customised keywords that you place within your Git commit messages. Create and edit tickets with your own custom fields specific to your project.
* Integrated bug tracking
* Created, edit, delete tickets
* Collect votes on each ticket
* Assign tickets to any developer
* Edit and close tickets via Git commits
CUSTOMIZE
Codaset has an amazing set of tools, which can be used to place fine-grained controls over who and what can be done with each of your projects. Define user roles, with a set of custom permissions, and you can control exactly what users can or cannot do with any part of your projects.
* Fine-grained permissions
* Create customised user roles
* Unlimited collaborators
* Assign custom permissions
* Control every aspect of your project
COMMUNITY
Codaset is perfect for open source software projects, and features tools that encourage and help you build a community around your code. Blog about your project with the integrated blog engine, and create an open or closed wiki, which is fully versioned. All public commenting is spam protected.
* Community around your code
* Integrated blog for each project
* Versioned wiki system
* Public or private commenting
* Every post spam protected
* Easily communicate with your users
I use codaset and github. Codaset for my private repositories, as it does have great project management, and fine grained control of who has access to what. I use github for public repositories. Mind you, Codaset does support all this for open source projects, for free.
Since practically all of us will be on OS X, GitX is a great front-end to Git, for managing check-ins. There is a fork on GitHub, which has significantly more features - I've just started using it and it looks great.
A key feature of Git is the staging area, which allows you to selective commit specific changes from your working directory. It goes even further in that you can actually commit specific edits within files. Very useful if you made a fix for a bug and only wanted to commit these specific changes. This is an incredibly useful feature. GitX allows you to take full advantage of this in it's UI.
Cheers,
Stu
thanks for the info. I'll give github a try. I'll keep you updated.
I started testing git:
-> I "cloned" the SVN repo locally
-> I started playing with branches
-> I applied some patches on one of the branches.
-> I registered an user in github
-> I imported the SVN repo into github via the github import service, but it hasn't finished the import yet, and I started it 24 hours ago.
--> http://github.com/ricardoquesada/cocos2d-iphone
I'll try again doing the import manually.
@riq, you can also do the import from googlecode yourself locally by using git svn, and then push up to github later. I imagine github queues these import jobs, so you might just have to wait?
I recently imported an svn repository based in EU (I'm in North America) and it was pretty fast when I did it locally.
Cheers,
Stu
craigching
Member
I'd rather you stay with SVN instead of going to mercurial as I've used git's SVN features for awhile now and feel they're very workable, that's how I've been tracking cocos2d development thus far. But, if you're giving github a try, I'm sure you're going to like what you find ;-) The git svn integration is very good, I haven't tried a git mercurial integration at all yet. But going to pure git would be a total dream :-D I've found github to be a great service for open source software, others can clone your repo and have you pull from them for everything from bug fixes to full on features. You'll like it, so much easier to collaborate then with SVN.
Yes, I tried git-svn, and it worked ok. Locally I have a pure git repository of cocos2d, I only need to push it to github... I'll do it tomorrow in case the github's import service doesn't finish by then.
Awesome - can't wait! So excited as I have lots of little things brewing that I want to share! I can commit to my own fork and you can pull as you desire!
eg, I created a set of File templates so you can create a new CCNode subclass, derived directly from CCNode, CCSprite or CCLayer. Saves having to enter that boilerplate code every time.
I have my own install_templates.sh script that installs the project and file templates into the /Libraries area, so that it survives Xcode installs, and also puts them into their own 'Cocos2d x.xx.xx' group. I'm sure many of you have some useful things that we could start to share and riq can pull as he desires.
Cheers,
Stu
@riq, what's your github name?
@craigching, definitely try this fork of GitX. I looked at the screen shots of GitY, and it doesn't appear to offer anything more than the enhanced fork of GitX. If you find different
Cheers,
Stu
@stu My github name is: ricardoquesada
Probably I'll create a "cocos2d" or "cocos2d-iphone" username and host the official cocos2d under that name, and not under "ricardoquesada". But I'll update my repo to "ricardoquesada" first, just to experiment with it.
Right now, I'm converting the SVN repo to GIT again, because I forgot to migrate the tags and branches.
You must log in to post.
