Re: TARBALLS DUE: Snapshot, Deep Freeze, But No Release Candidate

[jacob berkman <jacob ximian com>]

On Tue, 2002-06-04 at 13:35, Owen Taylor wrote:
> jacob berkman <jacob ximian com> writes:
> 
> > On Tue, 2002-06-04 at 13:01, Owen Taylor wrote:
> > > jacob berkman <jacob ximian com> writes:
> > > 
> > > > On Tue, 2002-06-04 at 08:55, Owen Taylor wrote:
> > > > > jacob berkman <jacob ximian com> writes:
> > > > > 
> > > > > > On Sun, 2002-06-02 at 12:21, Jeff Waugh wrote:
> > > > > > > Hi all,
> > > > > > >  
> > > > > > > As of Monday, no code changes should be committed to shipping modules [2]
> > > > > > > unless directly related to fixing these 9 bugs.
> > > > > > 
> > > > > > if this freeze is happening tomorrow, then we need to reach a consensus
> > > > > > on this quickly.
> > > > > 
> > > > > I'd really suggest that it would be better to do the 2.0.1 work on
> > > > > a branch; it's just a whole lot simpler if you don't have to merge
> > > > > the "development" branch onto HEAD at some point, and create
> > > > > a new -2-0 branch.
> > > > 
> > > > you mean, do 2.0.0 from HEAD, work on 2.0.1 in a branch, and then merge
> > > > that up after 2.0.0 comes out?
> > > 
> > > No, I mean you make a -2-0 branch now, work on that, make 2.0.0 from that,
> > > continue working on that branch for 2.0.1.
> > 
> > the problem is we are working on 2.0.1 *now* and not stopping for 2.0.0.
> 
> Well, if you are that incredibly active, then the right branch structure is:
> 
>  -HEAD-----`-----------------
>             \
>               `-gnome-2-0 ------------------------------------
>                            \                 \
>                              `--gnome-2-0-0   `----gnome-2-0-1
> 
> Or possibly:
> 
>  -HEAD-----------------------------------------------
>              \                 \            
>               `--gnome-2-0-0    `--gnome-2-0----------

i'd be in favor of this.

> If nobody is going to do non-bug-fix changes prior to 2.0.1. To me,
> branching a module for a single dot-release just seems silly, but
> I guess that's just me. I'd tend to just declare a freeze on commits
> for  module and queue up outstanding patches in bugzilla.

if they're in bugzilla they won't get any testing...

 - jacob