X-MimeOLE: Produced By Microsoft Exchange V6.5
Received: by onstor-exch02.onstor.net 
	id <01C7B9C4.49C0A40E@onstor-exch02.onstor.net>; Thu, 28 Jun 2007 12:38:30 -0800
MIME-Version: 1.0
Content-Type: multipart/alternative;
	boundary="----_=_NextPart_001_01C7B9C4.49C0A40E"
References: <WEBMAILyYa6yc6qsEgs00001e45@mail.onstor.com> <20070628133217.04a3717d@ripper.onstor.net>
Content-class: urn:content-classes:message
Subject: RE: PERFORCE change 24402 for review
Date: Thu, 28 Jun 2007 12:38:30 -0800
Message-ID: <BB375AF679D4A34E9CA8DFA650E2B04E02F3D392@onstor-exch02.onstor.net>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: PERFORCE change 24402 for review
Thread-Index: Ace5w2uEYWHJlY7tRPq1IwScPqQ2ogAACXH3
From: "Ken Renshaw" <ken.renshaw@onstor.com>
To: "Andy Sharp" <andy.sharp@onstor.com>
Cc: "Ed Kwan" <ed.kwan@onstor.com>,
	"Eric Barrett" <eric.barrett@onstor.com>,
	"Larry Scheer" <larry.scheer@onstor.com>,
	"Sandrine Boulanger" <sandrine.boulanger@onstor.com>,
	"Tim Gardner" <tim.gardner@onstor.com>

This is a multi-part message in MIME format.

------_=_NextPart_001_01C7B9C4.49C0A40E
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

Actually, it didn't go into Clio ( which is technically the R2_1_X_rel =
branch ). When we started 2.1, 2.2, and 2.3 at the exact same time we =
used a cascade branch model for those three:

main->R2_1_X_work->FB-LAMBORGHINI->FB-DELOREAN

This was done in this one case since the 2.1 code had to be pushed to =
2.2 in realtime, then into 2.3 and this saved a billion indirect merges. =
However, it still left me 1000 mini-merges to do afterwards so that I =
pushed the code back to main in order, too. The merge you just saw was =
actually:

DeLorean->main via R2_1_X_work since it was between them.=20

Pay no attention to the man behind the curtain ;)  This all goes away =
with the currently discussed branching models of course. We have =
actually used about 10 different variations of branching models to get =
to market and through the market, and hopefully the knee-jerk type =
reactions can stop in this regard and we can settle into a robust yet =
easy to maintain model.

Thanks,

-Ken


-----Original Message-----
From: Andy Sharp
Sent: Thu 6/28/2007 1:32 PM
To: Ken Renshaw
Cc: Ed Kwan; Eric Barrett; Larry Scheer; Sandrine Boulanger; Tim Gardner
Subject: Re: PERFORCE change 24402 for review
=20
Hmm, wondering why this went into 2.1/Clio.  I'm thinking this would
allow a flash to be built that won't run, ie., with the dynamic flash
layout but with clio on it, which won't work with the dynamic flash
layout, unless every other change related to that has also been
integrated into clio, which seems odd to me.  No customers actually
have clio do they?  Or none still have it.  Is that right?


On 28 Jun 2007 13:19:05 -0700 Ken Renshaw <ken.renshaw@onstor.com>
wrote:

> Change 24402 by kenr@kenr-linux-depot on 2007/06/28 13:14:55
>=20
> 	Push final (?) DeLorean change, P4 24294
>=20
> Affected files ...
>=20
> ... //depot/R2_1_X_work/nfx-tree/Tools/flash_install.sh#5 integrate
>=20
>=20
> http://liszt:1818/@md=3Dd&cd=3D//depot/$c=3DG35@/24402?ac=3D10


------_=_NextPart_001_01C7B9C4.49C0A40E
Content-Type: text/html;
	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV=3D"Content-Type" CONTENT=3D"text/html; =
charset=3Diso-8859-1">
<META NAME=3D"Generator" CONTENT=3D"MS Exchange Server version =
6.5.7652.24">
<TITLE>RE: PERFORCE change 24402 for review</TITLE>
</HEAD>
<BODY>
<!-- Converted from text/plain format -->

<P><FONT SIZE=3D2>Actually, it didn't go into Clio ( which is =
technically the R2_1_X_rel branch ). When we started 2.1, 2.2, and 2.3 =
at the exact same time we used a cascade branch model for those =
three:<BR>
<BR>
main-&gt;R2_1_X_work-&gt;FB-LAMBORGHINI-&gt;FB-DELOREAN<BR>
<BR>
This was done in this one case since the 2.1 code had to be pushed to =
2.2 in realtime, then into 2.3 and this saved a billion indirect merges. =
However, it still left me 1000 mini-merges to do afterwards so that I =
pushed the code back to main in order, too. The merge you just saw was =
actually:<BR>
<BR>
DeLorean-&gt;main via R2_1_X_work since it was between them.<BR>
<BR>
Pay no attention to the man behind the curtain ;)&nbsp; This all goes =
away with the currently discussed branching models of course. We have =
actually used about 10 different variations of branching models to get =
to market and through the market, and hopefully the knee-jerk type =
reactions can stop in this regard and we can settle into a robust yet =
easy to maintain model.<BR>
<BR>
Thanks,<BR>
<BR>
-Ken<BR>
<BR>
<BR>
-----Original Message-----<BR>
From: Andy Sharp<BR>
Sent: Thu 6/28/2007 1:32 PM<BR>
To: Ken Renshaw<BR>
Cc: Ed Kwan; Eric Barrett; Larry Scheer; Sandrine Boulanger; Tim =
Gardner<BR>
Subject: Re: PERFORCE change 24402 for review<BR>
<BR>
Hmm, wondering why this went into 2.1/Clio.&nbsp; I'm thinking this =
would<BR>
allow a flash to be built that won't run, ie., with the dynamic =
flash<BR>
layout but with clio on it, which won't work with the dynamic flash<BR>
layout, unless every other change related to that has also been<BR>
integrated into clio, which seems odd to me.&nbsp; No customers =
actually<BR>
have clio do they?&nbsp; Or none still have it.&nbsp; Is that right?<BR>
<BR>
<BR>
On 28 Jun 2007 13:19:05 -0700 Ken Renshaw =
&lt;ken.renshaw@onstor.com&gt;<BR>
wrote:<BR>
<BR>
&gt; Change 24402 by kenr@kenr-linux-depot on 2007/06/28 13:14:55<BR>
&gt;<BR>
&gt; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Push final (?) DeLorean change, P4 =
24294<BR>
&gt;<BR>
&gt; Affected files ...<BR>
&gt;<BR>
&gt; ... //depot/R2_1_X_work/nfx-tree/Tools/flash_install.sh#5 =
integrate<BR>
&gt;<BR>
&gt;<BR>
&gt; <A =
HREF=3D"http://liszt:1818/@md=3Dd&cd=3D//depot/$c=3DG35@/24402?ac=3D10">h=
ttp://liszt:1818/@md=3Dd&cd=3D//depot/$c=3DG35@/24402?ac=3D10</A><BR>
<BR>
</FONT>
</P>

</BODY>
</HTML>
------_=_NextPart_001_01C7B9C4.49C0A40E--
