On Wed, May 06, 2015 at 01:43:47PM -0700, Kevron Rees wrote:
On Wed, May 6, 2015 at 7:48 AM, Jonathan Maw
<jonathan.maw(a)codethink.co.uk>
wrote:
> On Wed, Apr 15, 2015 at 07:51:10AM -0700, Kevron Rees wrote:
>
> Hi Kevron,
>
> Sorry for the long delay between mails, I've been side-tracked by various
> other things.
>
> I'm a bit confused by the branches "0.14" and "master",
since my usual
> expectation of "master" being for new features and bugfixes, while
"0.14"
> is a stable branch that only gets bugfixes appears to be incorrect.
>
> I am also uncertain which branch would be "recommended" as a branch to
> follow
> for all the new features as they appear - "master" appears to lack
certain
> new features (using latest pygobject, for example), while "0.14" will
> eventually be replaced with a "0.15" branch.
>
Master is what you should track for new features. It does look like master
is missing the new GObject patch. I probably forgot to submit the patch to
master. I will add this patch to my latest pull request (#58) Are there
any other features/fixes you expect on master that are missing?
Hi Kevron,
That is the only thing I am aware of.
I checked whether either branch would have problems with json-c, and noticed
a couple of things:
1. The plugins "cangenplugin", "cansimplugin",
"openxcplugin", and "websocket"
still use json-c.
2. The documentation in README.md and docs/ambd.in.md state that json-c is
required.
No doubt you are well aware of this.
>
> Can you explain to me the philosophy behind these branches?
>
>
Master is the development branch and is considered unstable. Topic
branches, like 0.14 are created when the version is considered
"beta"-quality ie, features are completed but there may be some bugs.
Within the topic branches, take into account the project version number
(ambd -v). The version numbering scheme is roughly this:
0.xx.8yy - Alpha quality. Features still in development. ie 0.15.801
0.xx.9yy - Beta quality. Feature generally complete. Only bug fixes
allowed with possibly some exceptions for features. Example: 0.14.902
0.xx.0 - Final release. ie 0.13.0
0.xx.z - Bug fix release. Major bugs or security flaws may be back-ported
to released versions -often by request. ie 0.13.2
Hope that helps!
Kevron
Thanks, that clears things up a lot.
Best regards,
Jonathan