[ros-kernel] Release process

Vizzini vizzini at plasmic.com
Wed Oct 15 18:10:14 CEST 2003


On Sun, 2003-10-12 at 11:07, Vizzini wrote:
> On Sun, 2003-10-12 at 03:42, Ge van Geldorp wrote:
> > - It's not clear to me who's responsible for getting changes made in the
> > branch back into HEAD. In Vizinni's message "CVS Branching Proposal" of
> > 2 Sept the proposal is: "Any commits on a branch must be merged into
> > HEAD by the committer". Then, Casper said on 5 Oct in a "Re: CVS Update:
> > reactos" message: "Don't fix it on both branches since CVS cannot track
> > what has been merged and what has not been merged". Either way works for
> > me, we just need to make a decision on it.

I have merged any remaining changes from the 0.1.4 release branch into
HEAD.

I propose that any developer who commits a fix on any branch be
responsible for merging that change into HEAD.  Anyone disagree?

As Casper pointed out, merging is a bit tricky, as you cannot re-merge
after an initial merge or CVS will get confused.  I think our patches
are small enough, though, that this won't be much of a problem.

 -Vizzini




More information about the Ros-kernel mailing list