Hi folks,
I spent all day Thursday going through the differences between trunk and
1.4. There were a number of differences between the two, which is
concerning since this is leading both to merge conflicts as well as
features which are fixed in trunk but not branch, or vice versa. There
were several instances where tickets had been committed to trunk, but
not assigned to me for merge to 1.4.x. Likewise, there were a few which
were committed directly to 1.4.x (!) but not to trunk. Since we have
several new developers, and we seem to need this for the current ones, I
present a refresher course on our workflow:
- Assign a ticket to yourself (or have one assigned to you)
- Mark it as in progress when you are working on it
- Finish work
If ticket is for a bug:
- Commit ticket to TRUNK
If the merge window is closed:
- Assign ticket to Greg Logan for review and merge to branch(es)
If ticket is for a feature:
If the merge window is closed:
- Create a branch named after that ticket in /branches
- Commit changes there
- Merge that branch back into trunk when the window opens
If the merge window is open:
- Commit directly to trunk
For those interested, there are currently a number of remaining
differences between branch and trunk. Those are the result of tickets
which are either done and just not assigned to me for merge (Adam's
ingest limiting code) or are tickets which are currently in progress
(Xavier's XML namespace changes).
G
_______________________________________________
Matterhorn mailing list
[email protected]
http://lists.opencastproject.org/mailman/listinfo/matterhorn
To unsubscribe please email
[email protected]
_______________________________________________
