Jump to content


Photo

New mercurial workflow for Zurmo

mercurial workflow

  • Please log in to reply
No replies to this topic

#1 Ivica

Ivica

    Advanced Member

  • Moderators
  • 565 posts

Posted 23 October 2012 - 09:18 AM

I did some research on how we can standardize and improve our Mercurial process flow. I came to these conclusions:

There will be three main branches:
1. default - this will be our development (working) branch. We can often merge into this branch.
2. candidate - this branch will contain code that is ready to be released as stable(see release branch), but we merge it here for final testing. The default branch will be merged into this branch, but never directly into the release branch. If some bugs are found in the release branch, code must be fixed in the candidate branch and merged into the release branch.
3. release - this will contain only stable code. We will never commit changes into this branch. Code into this branch can be merged only from the candidate branch.

Additionally we will have feature branches, like we had until now, and feature branches can be merged only into the default branch and other featured branches.

Until now, we used only default branch and feature branches, so we merged everything into the default branch. When we discovered some bugs, the default branch was already a few commits ahead from the stable release, so we had to fix issues in the default branch, and tag some unwanted commits from the default branch into the new stable release.

Please share your opinions on this idea or suggestions.

We will probably start to use this approach after we release the next stable version(0.7.70).




0 user(s) are reading this topic

0 members, 0 guests, 0 anonymous users