Tree and branch states

Unread post by **Moonchild** » 2015-08-03, 09:33

Since things have gotten rather confusing for contributors lately, I've reorganized the tree, committed Goanna to main development, and split out development a different way.

This post to clarify the resulting structure.

The Goanna branch has been merged, and continued development of the milestone will have to be done on the master branch (trunk)
A separate branch (v25_Dev) is present for additional development on 25.* versions, which will be mostly security & usability fixes from this point forward. No main new features should land there.
Unless a patch is specific to 25.* only, it should be landed on master, and if it requires uplift to 25.*, please add a note to the PR or submitted patch

Previously:

Code: Select all

master (v25/26 mixture)
|
+- Goanna (v26)
+- RelBranch (v25)
+- Atom (v25 only, has not been updated since 25.6)
  +-Atom_RelBranch (v25)

New:

Code: Select all

master = Goanna (v26)
|
+- RelBranch (v26) (new, when we get to that stage))
+- Atom (v26)
| +- Atom_RelBranch (v26)
|
+- v25_Dev
  +- RelBranch (v25) (for as long as we develop pre-Goanna)
  +- v25_Atom
    +- Atom_RelBranch (v25)