to clarify further from my conversation with Josh and others today in
the Matterhorn videoconference...
-release blocker fixes should only be committed to 1.1.x
-1.2 work may resume on trunk
-Josh and Tobias will merge any additional 1.1.x fixes to trunk after
the next RC.
On 3/8/11 2:22 AM, Josh Holtzman wrote:
On Fri, Mar 4, 2011 at 11:19 PM, Adam Hochman <[email protected]
<mailto:[email protected]>> wrote:
Now that the first release candidate has been cut, we should only
commit release blocker fixes to the 1.1.x branch. Your fixes
should be made locally or committed to a personal, separate branch
of 1.1.x (ideally your institution's msub repo). Once we merge
1.1.x with trunk (hopefully next week), you should merge your
local fixes with trunk. If we are still committing release
blocker fixes to 1.1.x after the trunk merge, these fixes should
also be made to trunk. Until then, release blocker fixes should
be exclusively committed to 1.1.x branch.
Capisce?
Regarding merging 1.1.x with trunk, I think the following makes
sense...
1. I'll generate an svn diff btwn 1.1.x and branch early next week
2. In discussion with others, I'll assign individuals familiar
with modules the task of merging btwn. the two. The merge should
happen with a specific rev of branch.
3. After all of the merges have been completed, each assignee
will do an svn diff btwn trunk and the specified branch rev and
confirm that their modules are identical with branch.
4. We do a very rudimentary QA of trunk to make sure it has the
same behavior as branch.
Sound reasonable?
Not really. A piece-by-piece merge won't work, because APIs and
dependencies between the modules have changed. Tobias and I already
took the first RC from the 1.1.x branch and brought the changes over
to the trunk because we were blocked in our work toward 1.2. My
apologies for missing this proposal, Adam. I would have responded
sooner with my objection, rather than just doing the merge to trunk.
Josh
_______________________________________________
Matterhorn mailing list
[email protected]
http://lists.opencastproject.org/mailman/listinfo/matterhorn
To unsubscribe please email
[email protected]
_______________________________________________