|
|
Paraslash Audio Streaming |
| About News Download Documentation Development |
Most of the development happens in topic branches where each development topic corresponds to one git 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.
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 |
|---|---|---|---|
| build | pu | 7 | Improvements to the build system |
| misc | pu | 2 | Smallish changes for master |
| select- | pu | 1 | com_select(): Support the special argument "-" |
| wmadec | pu | 3 | Improvements to the wma decoder |
Pass the hash value shown as sha1 below to git
checkout to check out one particular topic branch.
Started on 2025-01-19 .gitignore | 1 - GIT-VERSION-GEN | 42 ———————– Makefile.real | 99 ++++++++++++++++++++++++++————————— afh.c | 1 - audioc.c | 1 - audiod.c | 1 - audiod_command.c | 1 - client.c | 1 - client_common.c | 1 - command.c | 1 - configure.ac | 2 +- filter.c | 1 - gui.c | 1 - m4/lls/copyright.m4 | 28 ++++++++++++— m4/lls/makefile | 7 ++– mixer.c | 1 - oggdec_filter.c | 8 +++++ play.c | 1 - recv.c | 1 - server.c | 1 - string.c | 53 ++++++++++++++++++++++++++++ string.h | 5 +++ upgrade_db.c | 1 - version-gen.sh | 43 +++++++++++++++++++++++ version.c | 69 ————————————- version.h | 5 — write.c | 1 - yy/makefile | 7 ++– 28 files changed, 187 insertions(+), 197 deletions(-)
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. gui.c | 4 ++– gui_theme.c | 4 ++– 2 files changed, 4 insertions(+), 4 deletions(-)
A single patch which implements the new feature.
Started on 2024-11-30.
afs.c | 48 ++++++++++++++++++++++++++++++----------------
m4/lls/server_cmd.suite.m4 | 8 +++++---
2 files changed, 37 insertions(+), 19 deletions(-)
Started on 2025-01-22 imdct.c | 17 ++— wmadata.h | 16 —– wmadec_filter.c | 211 +++++————————————————— 3 files changed, 23 insertions(+), 221 deletions(-)