Ogre's branching model

Discussion area about developing or extending OGRE, adding plugins for it or building applications on it. No newbie questions please, use the Help forum for that.
Post Reply
User avatar
nmodprime
Gnoblar
Posts: 11
Joined: Sat Apr 23, 2011 3:54 am

Ogre's branching model

Post by nmodprime » Sat Dec 29, 2012 7:45 am

I see here that the branching model is supposed to be
  • 'default' is the bleeding edge.
  • named branches, like 'v1-8' are stable branches which only receive bug fixes.
But what seems to have happened is that 'v1-9' and 'v2-0' have become the bleeding edge where new features are being developed, and 'default' hasn't been updated in 2 months.

This is confusing and has led at least me to waste some time trying to fix compilation errors in 'default' when the problems have been resolved in 'v1-9'. What gives?
0 x

User avatar
nmodprime
Gnoblar
Posts: 11
Joined: Sat Apr 23, 2011 3:54 am

Re: Ogre's branching model

Post by nmodprime » Sat Dec 29, 2012 8:04 am

This could be relevant: A successful Git branching model, which is implemented by a git extension called git-flow.

A more general mercurial version: hgflow.
0 x

CABAListic
OGRE Retired Team Member
OGRE Retired Team Member
Posts: 2903
Joined: Thu Jan 18, 2007 2:48 pm
Contact:

Re: Ogre's branching model

Post by CABAListic » Sat Dec 29, 2012 11:22 am

The information on the site is outdated. We decided we need more than one development branch due to the expected reworks in 2.0. As such, v1-8 is the current stable branch, v1-9 is the primary development branch for the next major version, and v2-0 is the branch for major changes towards 2.0. We merge upwards, i.e v1-8 -> v1-9 -> v2-0 -> default. However, since currently no development is going on in default, the merge doesn't happen too often.
Most likely you will want either v1-8 or v1-9 at this point.
0 x

Post Reply