[LITMUS^RT] new branch naming convention for merge proposals

Björn Brandenburg bbb at mpi-sws.org
Wed May 30 09:48:13 CEST 2012


Hi all,

to simplify distributing branches that are proposals for merging, I've added a new namespace to the git repository. Any branch in the 'prop/' namespace in the MPI repository will automatically be mirrored on the public git repository. This makes it easier for others to look at proposed changes (MPI students to do not have access to rtsrv.cs.unc.edu).

Proposed workflow:

1) Prepare your branch for review / merging.
2) Name your branch 'prop/thing-that-you-are-working-on' (note the slash after prop).
3) Ask Jonathan or me to push the branch to MPI's gitolite server.
4) The branch will show up after at most 5 minutes on the public git repo on litmus-rt.org.
5) Send out an email to the mailing list announcing your merge proposal.

If a prop/ branch is deleted from MPI's gitolite server, it will also disappear from litmus-rt.org.

For demonstration purposes, I've pushed Glenn's binary heap patch to prop/binary-heap.

Note this is not mandatory; you can also use two other methods.

1) Simply send your patches to the mailing list, like on LKML.
2) Push to some other public repository (e.g., your github account) and announce that repository/branch on the mailing list.

However, please avoid announcing proposed patches on non-public branches; this excludes contributors without access to UNC/MPI systems.

Thanks,
Björn





More information about the litmus-dev mailing list