Upstreaming Contributions – Where did the Cocos2d-x Code Go?

This is a repost from an original post at DevBlog

If you visit our Cocos2D-X repository today you will find just a file. Where are the rest?  We removed them two weeks ago, in that Go Upstream! commit.

This sequence exemplifies a class of our repositories at GitHub: we created the repository to produce a port of the upstream project, which then was incorporated into an official release: cocos2d-1.0.1-x-0.11.0.  All official Cocos2d-X releases since then, including the latest, cocos2d-2.0-rc0a-x-2.0, support our platform.  Removing our code and pointing upstream removes confusions (and saves us time).

Cocos2d-X is the first instance where we have removed the code, but upstreaming is a principle we are following in many other cases.  In some cases we contribute directly to the upstream community, in others we go through an intermediate public repository.

Direct Contributions

Some examples of direct contributions include:

Staged Contributions

Some examples of staged contributions include:


About pelegri

VP, Technology at Progress Software
This entry was posted in Uncategorized. Bookmark the permalink.

Leave a Reply

Fill in your details below or click an icon to log in: Logo

You are commenting using your account. Log Out /  Change )

Google+ photo

You are commenting using your Google+ account. Log Out /  Change )

Twitter picture

You are commenting using your Twitter account. Log Out /  Change )

Facebook photo

You are commenting using your Facebook account. Log Out /  Change )


Connecting to %s