Branches

We use the following branches.

master

The master branch is only used for releases and patches for our commercial customers. It will typically only be updated at the time of a new release.

Development branch (currently ccase/r13b04_dev)

Behind the scenes, we still use clearcase. The development branch follows the corresponding branch in clearcase. Only stable changes are merged to the development branch. Branches created in git are first transferred to the development branch in clearcase before it appears on the ccase/r13bXX_dev branch in git, but we try to preserve as much history as possible.

You can safely base branches on the development branch. It will not be rewinded. Typically, everything in the development branch will be included in the next release.

pu (‘proposed updates’)

The pu branch contains everything in the development branch and merges of all topic branches that have not yet graduated to the development branch. There is a web page with an overview of what is currently included: Currently in the ‘pu’ branch.

The pu branch will be rebuilt frequently, so it is bad idea to base branches on it.

We will send out an information email about the status of the topics on the pu branch approximately twice a week.

You can list all topics currently on the branch like this:

git log --oneline --first-parent ccase/r13b04_dev..pu

The output may look like this:

5dba534 Merge branch 'as/c_nc-fix' into pu
7b3cd7d Merge branch 'bg/make_stub_module-fix' into pu
4bf6686 Merge branch 'mh/to_erl-error-messages' into pu
8f1deea Merge branch 'ks/dialyzer-wx-fix' into pu
4ca3b67 Merge branch 'sv/sys_get_status' into pu
c976574b Merge branch 'bd/http_chunk_fix' into pu
6c68df3 Merge branch 'bg/on_load-types' into pu
36f2430 Merge branch 'po/odbc-update-delete-no-rows' into pu
f3ff5fe Merge branch 'ng/readme' into pu
fcd86c8 Merge branch 'egil/misc-egd' into pu
2c2a61d Merge branch 'egil/readme-debug-emulator' into pu

If you want to create your own local branch to follow one of the branches, say sv/sys_get_status you can copy and paste the branch name and commit ID and write the following command:

git branch sv/sys_get_status 4ca3b67^2

Note the ^2 at the end (it means “follow the second parent of the commit”).