X-MimeOLE: Produced By Microsoft Exchange V6.5
Received: by onstor-exch02.onstor.net 
	id <01C7F0AC.776523C6@onstor-exch02.onstor.net>; Thu, 6 Sep 2007 09:36:33 -0800
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Content-class: urn:content-classes:message
Subject: RE: Zonda checkins
Date: Thu, 6 Sep 2007 09:36:33 -0800
Message-ID: <BB375AF679D4A34E9CA8DFA650E2B04E022159D3@onstor-exch02.onstor.net>
In-Reply-To: <20070905214413.4ee21527@ripper.onstor.net>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: Zonda checkins
Thread-Index: AcfwQJPQwXtut424RHu0sTpkuhUUbAAa8dLw
From: "Larry Scheer" <larry.scheer@onstor.com>
To: "Andy Sharp" <andy.sharp@onstor.com>

Welcome back to the land of the working!
Good to see you didn't get your sense of humor knocked out of you!

Later,

Larry

-----Original Message-----
From: Andy Sharp=20
Sent: Wednesday, September 05, 2007 9:44 PM
To: Brian DeForest
Cc: Tim Gardner; Larry Scheer
Subject: Re: Zonda checkins

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.
>=20
> _____________________________________________
> From: Tim Gardner=20
> Sent: Wednesday, September 05, 2007 5:23 PM
> To: Brian DeForest
> Subject: RE: Zonda checkins
>=20
> 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=20
> Sent: Wednesday, September 05, 2007 5:22 PM
> To: Tim Gardner
> Subject: RE: Zonda checkins
>=20
> 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.
>=20
> _____________________________________________
> From: Tim Gardner=20
> Sent: Wednesday, September 05, 2007 5:18 PM
> To: Brian DeForest
> Subject: RE: Zonda checkins
>=20
> 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.
>=20
> _____________________________________________
> From: Brian DeForest=20
> Sent: Wednesday, September 05, 2007 5:11 PM
> To: dl-Software
> Subject: Zonda checkins
>=20
> 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.
>=20
> Once the release branch is created, only P1/P2 ("must fix") fixes will
> be allowed. =20
>=20
> 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.
>=20
> Brian
