AF:
NF:0
PS:10
SRH:1
SFN:
DSR:
MID:<20070905214349.607207b4@ripper.onstor.net>
CFG:
PT:0
S:andy.sharp@onstor.com
RQ:
SSV:onstor-exch02.onstor.net
NSV:
SSH:
R:<brian.deforest@onstor.com>,<tim.gardner@onstor.com>,<larry.scheer@onstor.com>
MAID:1
X-Sylpheed-Privacy-System:
X-Sylpheed-Sign:0
SCF:#mh/Mailbox/sent
RMID:#imap/andys@onstor.net@onstor-exch02.onstor.net/INBOX	0	BB375AF679D4A34E9CA8DFA650E2B04E056085BF@onstor-exch02.onstor.net
X-Sylpheed-End-Special-Headers: 1
Date: Wed, 5 Sep 2007 21:44:13 -0700
From: Andrew Sharp <andy.sharp@onstor.com>
To: "Brian DeForest" <brian.deforest@onstor.com>
Cc: "Tim Gardner" <tim.gardner@onstor.com>, "Larry Scheer"
 <larry.scheer@onstor.com>
Subject: Re: Zonda checkins
Message-ID: <20070905214413.4ee21527@ripper.onstor.net>
In-Reply-To: <BB375AF679D4A34E9CA8DFA650E2B04E056085BF@onstor-exch02.onstor.net>
References: <BB375AF679D4A34E9CA8DFA650E2B04E056085AD@onstor-exch02.onstor.net>
	<BB375AF679D4A34E9CA8DFA650E2B04E056085B3@onstor-exch02.onstor.net>
	<BB375AF679D4A34E9CA8DFA650E2B04E056085BF@onstor-exch02.onstor.net>
Organization: Onstor
X-Mailer: Sylpheed-Claws 2.6.0 (GTK+ 2.8.20; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Wed, 5 Sep 2007 17:25:48 -0700 "Brian DeForest"
<brian.deforest@onstor.com> wrote:

> I think so, but I haven't been policing them either.   If you see a
> "wrong" checkin, you should bring it to their attention.
> 
> _____________________________________________
> From: Tim Gardner 
> Sent: Wednesday, September 05, 2007 5:23 PM
> To: Brian DeForest
> Subject: RE: Zonda checkins
> 
> sounds good. It was my understanding that Ed's team was already using
> dev.
> I have seen several integrates from the dev branch to the various
> patch branches.


It sure would be good news if they were.  I could go back to hospital
and have the file history brain anurism slightly reduced in size.

> _____________________________________________
> From: Brian DeForest 
> Sent: Wednesday, September 05, 2007 5:22 PM
> To: Tim Gardner
> Subject: RE: Zonda checkins
> 
> We discussed this previously.   If there were any remaining 2.2.x.x
> branches created prior to the dev branch, and/or any escalation fixes
> were checked into these branches and not the dev branch (as apparently
> was the case), then they need to be merged.   I've seen recent emails
> from Ed in the past week indicating he will start checking into the
> dev branch (I think this was at Ken's request).  No worries, I think
> we're all in sync about checking into the dev branch first, both now
> and after the Zonda release branch is created.
> 
> _____________________________________________
> From: Tim Gardner 
> Sent: Wednesday, September 05, 2007 5:18 PM
> To: Brian DeForest
> Subject: RE: Zonda checkins
> 
> I don't quite understand this. What is being merged from 2.x and
> 3.0.x? All work is supposed to be done from the dev branch so there
> should not be anything to merge.
> 
> _____________________________________________
> From: Brian DeForest 
> Sent: Wednesday, September 05, 2007 5:11 PM
> To: dl-Software
> Subject: Zonda checkins
> 
> This week the 2.x.x.x and 3.0.x.x releases will be merged into the dev
> branch.  At that point, a Zonda release branch will be created and
> instructions will be sent about how to checkin Zonda fixes.
> 
> Once the release branch is created, only P1/P2 ("must fix") fixes will
> be allowed.  
> 
> Exceptions can be made (e.g. for low risk, high reward fixes), but
> need to be approved by Charissa.   Coverity bug fixes will still be
> allowed.
> 
> Brian
