paraslash Paraslash Audio Streaming
About   News   Download   Documentation   Development

Development


Development happens in topic branches where each topic corresponds to one branch. Each topic branch is merged into either of two integration branches named next and pu ("proposed updates"). The integration branches are pushed to the public repository but the topic branches are not.

Topics in early development are only merged into the pu integration branch. When the topic is feature-complete, has been tested, has no known bugs, and is fully documented, it graduates to next. Thus, topics in next are expected to be of higher quality than those in pu.

When a topic is ready for mainline, it is merged into the master integration branch and vanishes from here, since it is no longer considered as being in development. Since releases are cut from master, the commits of the topic will become part of the next release. Maintenance releases are drawn from the maint integration branch in a similar vein.

No development takes place on master and maint but the two special topic branches misc and for-maint collect small commits aiming for master and maint, respectively. The for-maint branch only receives important fixes.

The table below shows the current development topics. Run git checkout pu to get all topics or git checkout next to enable only the mature topics.

Topic IB #C Description
for-maint pu 0 Urgent fixes for old bugs
misc pu 2 Smallish changes for master
select- pu 1 Teach the select subcommand to support the special argument "-".

Topic branch details

Pass the hash value shown as sha1 below to git checkout to check out one particular topic branch.

for-maint

This branch accumulates small but significant hotfixes for known bugs in the most stable integration branch, “maint”. Only serious issues are fixed here, and no development takes place on this branch.

The purpose of the branch is to give such urgent fixes at least a small amount of testing in pu before they are incorporated into maint. During this time the patch can be tweaked, and the documentation can be improved. Usually the commits of this branch are merged quickly, however, and it it perfectly normal if this branch is empty.

misc

The stuff in here is too small to get its own topic branch. The commits are generally regarded as safe enough to be applied directly to “master” without cooking in “next” first. However, if a commit induces a merge conflict or is important enough to get mentioned in an item of the NEWS file, the commit should get a dedicated topic branch.

Unlike most other topic branches, this branch never promotes to “next”. When a set of commits is ready to graduate to “master”, the branch is rebased onto “master” and its commits are re-ordered so that the graduating commits appear at the beginning. The last such commit is merged to “master”. This always results in a fast-forward merge, so no merge message needs to be supplied. exec.c | 8 ++++++++ gui.c | 4 ++– playlist.c | 11 ++++++—– 3 files changed, 16 insertions(+), 7 deletions(-)

select-

A single patch which implements the new feature.

Started on 2024-11-30.

     afs.c                      | 34 +++++++++++++++++++++++++---------
     m4/lls/server_cmd.suite.m4 |  8 +++++---
     2 files changed, 30 insertions(+), 12 deletions(-)