Adam,

Why merge branch with trunk before 1.1 final comes out?  To me it would
be simpler to wait until we have released 1.1 to bring the changes
across.

I'm fine with either, so this isn't disagreement to the #proposal, but
it runs counter to what I expected.

Chris

On Fri, 04 Mar 2011 14:19:58 -0800
Adam Hochman <[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?
> 
> ~Adam
> _______________________________________________
> Matterhorn mailing list
> [email protected]
> http://lists.opencastproject.org/mailman/listinfo/matterhorn
> 
> 
> To unsubscribe please email
> [email protected]
> _______________________________________________



-- 
Christopher Brooks, BSc, MSc
ARIES Laboratory, University of Saskatchewan

Web: http://www.cs.usask.ca/~cab938
Phone: 1.306.966.1442
Mail: Advanced Research in Intelligent Educational Systems Laboratory
     Department of Computer Science
     University of Saskatchewan
     176 Thorvaldson Building
     110 Science Place
     Saskatoon, SK
     S7N 5C9
_______________________________________________
Matterhorn mailing list
[email protected]
http://lists.opencastproject.org/mailman/listinfo/matterhorn


To unsubscribe please email
[email protected]
_______________________________________________

Reply via email to