One consequence of executing the
TIP to merge .LRN code in with OpenACS has been a change in the branching structure. We used to have a
dotlrn-2-0 branch in the dotlrn cvs tree, and
oacs-5-0 in the openacs tree. With the merge, a pending release of OpenACS 5.1, and .LRN 2.1, the picture is less clear.
The immediate problem is where people should be committing work intended to be released in .LRN 2.0.4. In the old system, if the work was on OpenACS core, it went into oacs-5-0, if it was in dotlrn-prereq module, it also went into oacs-5-0, and if it was in dotlrn-core, it went into dotlrn-2-0.
So the obvious thing to do now would appear to be, branch all the dotlrn-core packages into oacs-5-0. This allows checkout of all dotlrn, prereq, and core on the same branch tag, which simplifies things.
However, we are about to release 5.1, which will require changes to dotlrn. So, we should also branch the current dotlrn code to oacs-5-1. If there are future changes on the dotlrn code in oacs-5-0, they will have to get merged to 5-1 or HEAD, but that's the same as with any other package.