We're back

43 views
Skip to first unread message

Rodrigo Araújo

unread,
Apr 13, 2012, 9:39:03 AM4/13/12
to cair...@googlegroups.com
Hello everyone,

The migration to GitHub is now complete. 

Thanks to Mike Rooney, we have all of our old commit history on the new repository.

And thanks to everyone who participated on the discussion of git branching models, we're now using Vincent Driessen's model

We'll have 5 types of branches:
  • Master: the main branch; The only branches that get merged to it are the version-changing ones, whether they're major releases or bug-fixes;
  • Develop: where all the magic happens. Stuff gets coded on feature branches, then merged to develop and tested;
  • Features: whenever anyone comes up with a new feature, a new branch is created for that. When done and tested, it gets merged to the develop;
  • Release-1.x: if we feel our develop branch is stable and feature packed, it gets branched, all version numbers are updated and tested. If all goes well, this one gets merged to the master and develop branches;
  • Fixes: if any bugs pop up on the master branch, we branch the master, correct the bug, and merge the fix-branch back to the master and develop branches.
If it sounded confusing, please read the article, as he does a much better job at explaining this than I did.

So, I've finally released the version 1.2 (it's tagged on GitHub) based on what was on our trunk on launchpad. I ran our tests and everything went ok, just needed some name changes and synchronization between the seriestests.py and tests.py files.

And I've also started building a page on GitHub for CairoPlot. I tried to add the GitHub handle for everyone who contributed to the project, if I missed someone, please let me know.

Let's get to work on version 2.0.

--
Rodrigo Araújo

Reply all
Reply to author
Forward
0 new messages