X-MimeOLE: Produced By Microsoft Exchange V6.5
Received: by onstor-exch02.onstor.net 
	id <01C7FBC6.127BC664@onstor-exch02.onstor.net>; Thu, 20 Sep 2007 12:37:33 -0800
MIME-Version: 1.0
Content-Type: multipart/alternative;
	boundary="----_=_NextPart_001_01C7FBC6.127BC664"
Content-class: urn:content-classes:message
Subject: RE: Developers doing their own merges to Release branches
Date: Thu, 20 Sep 2007 12:37:33 -0800
Message-ID: <BB375AF679D4A34E9CA8DFA650E2B04E05A251FB@onstor-exch02.onstor.net>
In-Reply-To: <BB375AF679D4A34E9CA8DFA650E2B04E05A251C4@onstor-exch02.onstor.net>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: Developers doing their own merges to Release branches
Thread-Index: Acf7w7cECkYtZoFLQU+6GYEfc3BTuQAAhPrw
References: <BB375AF679D4A34E9CA8DFA650E2B04E05A251C4@onstor-exch02.onstor.net>
From: "Brian DeForest" <brian.deforest@onstor.com>
To: "Ken Renshaw" <ken.renshaw@onstor.com>,
	"Larry Scheer" <larry.scheer@onstor.com>,
	"Andy Sharp" <andy.sharp@onstor.com>,
	"Charissa Willard" <charissa.willard@onstor.com>,
	"Chris Vandever" <chris.vandever@onstor.com>,
	"Maxim Kozlovsky" <maxim.kozlovsky@onstor.com>,
	"Jonathan Goldick" <jonathan.goldick@onstor.com>
Cc: "Sandrine Boulanger" <sandrine.boulanger@onstor.com>

This is a multi-part message in MIME format.

------_=_NextPart_001_01C7FBC6.127BC664
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Adding a few more people to preview this.
=20
Will this properly preserve white space changes?

________________________________

From: Ken Renshaw=20
Sent: Thursday, September 20, 2007 1:21 PM
To: Brian DeForest; Larry Scheer; Andy Sharp; Charissa Willard
Cc: Sandrine Boulanger
Subject: Developers doing their own merges to Release branches



NOTE: Please review this email I'm poised to send out synchronous with
Zonda sub12. Please send me any feedback and/or corrections and I'll add
them, thanks all. -Ken

=20

Hi all.

=20

Starting with Zonda project and submittal 12 individual developers will
be responsible for merging their own Must-Fix defects into the Zonda
release branch R3_1_0_rel. This is to facilitate spreading the merge
load across dev instead of me doing them all, and in the case of merge
conflicts the proper person is there looking at the code to get it
massaged and working.=20

=20

Basically, process-wise all you need to do is when you close a Zonda
must-fix defect, you must do one additional step of merging the change
into the release branch. The instructions for doing so are listed below,
both for the P4 CLI  and for P4V. In either case if you have any trouble
or questions please feel free to ask me for help.

=20

HOWTO: Merge a single changelist from the dev branch into the R3_1_0_rel
branch using the Perforce CLI

=20

Assume changelist 12345 needs to be merged over:

=20

-p4 integrate -i -d //depot/dev/...@12345,@12345 //depot/3_1_0_rel/...

-p4 resolve

-p4 submit

=20

=20

HOWTO: Merge a single changelist from the dev branch into the R3_1_0_rel
branch using the Perforce visual client P4V

=20

NOTE: There are at least 3 or 4 ways to do this in the UI, this is
probably the most direct method.

=20

Assume changelist 12345 needs to be merged over:

=20

-From P4V with your current client for the dev branch opened, select
View->Submitted Changelists to get a list of recent checkins to the dev
branch.

=20

-Right-click on your changelist and select "Integrate using Submitted
Changelist "25527"

=20

-In the pop-up box, change the Target path to point to R3_1_0_rel
instead of dev

=20

-Click Preview if desired, or just Integrate to perform the integration

=20

-Select the Pending changelist tab in the right window pane, Right-click
on the 'default' changelist and select "Resolve files..."

=20

-Based on what you see you can either select one of the auto-merge
functions or just click on "Run Merge Tool" to bring up the 3-way,
color-coded diffing/resolution tool

=20

-Select the appropriate code blocks for the merge, select File->Exit
when finished, and confirm that you want to use this edited version of
the file.

=20

-Right-click again on the 'default' changelist and this time select
"Submit" to complete the submission.

=20

The process looks cumbersome but is intuitive once you grasp the
integrate/resolve/submit cycle, but the CLI variant is obviously a
little more direct.

=20

Thanks,

=20

-Ken

=20


------_=_NextPart_001_01C7FBC6.127BC664
Content-Type: text/html;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML xmlns=3D"http://www.w3.org/TR/REC-html40" xmlns:o =3D=20
"urn:schemas-microsoft-com:office:office" xmlns:w =3D=20
"urn:schemas-microsoft-com:office:word"><HEAD>
<META http-equiv=3DContent-Type content=3D"text/html; =
charset=3Dus-ascii">
<META content=3D"MSHTML 6.00.2900.3020" name=3DGENERATOR>
<STYLE>@page Section1 {size: 8.5in 11.0in; margin: 1.0in 1.25in 1.0in =
1.25in; }
P.MsoNormal {
	FONT-SIZE: 12pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: "Times New Roman"
}
LI.MsoNormal {
	FONT-SIZE: 12pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: "Times New Roman"
}
DIV.MsoNormal {
	FONT-SIZE: 12pt; MARGIN: 0in 0in 0pt; FONT-FAMILY: "Times New Roman"
}
A:link {
	COLOR: blue; TEXT-DECORATION: underline
}
SPAN.MsoHyperlink {
	COLOR: blue; TEXT-DECORATION: underline
}
A:visited {
	COLOR: purple; TEXT-DECORATION: underline
}
SPAN.MsoHyperlinkFollowed {
	COLOR: purple; TEXT-DECORATION: underline
}
SPAN.EmailStyle17 {
	COLOR: windowtext; FONT-FAMILY: Arial; mso-style-type: personal-compose
}
DIV.Section1 {
	page: Section1
}
</STYLE>
</HEAD>
<BODY lang=3DEN-US vLink=3Dpurple link=3Dblue>
<DIV dir=3Dltr align=3Dleft><SPAN class=3D594333520-20092007><FONT =
face=3DArial=20
color=3D#0000ff size=3D2>Adding a few more people to preview=20
this.</FONT></SPAN></DIV>
<DIV dir=3Dltr align=3Dleft><SPAN class=3D594333520-20092007><FONT =
face=3DArial=20
color=3D#0000ff size=3D2></FONT></SPAN>&nbsp;</DIV>
<DIV dir=3Dltr align=3Dleft><SPAN class=3D594333520-20092007><FONT =
face=3DArial=20
color=3D#0000ff size=3D2>Will this properly preserve white space=20
changes?</FONT></SPAN></DIV><BR>
<DIV class=3DOutlookMessageHeader lang=3Den-us dir=3Dltr align=3Dleft>
<HR tabIndex=3D-1>
<FONT face=3DTahoma size=3D2><B>From:</B> Ken Renshaw <BR><B>Sent:</B> =
Thursday,=20
September 20, 2007 1:21 PM<BR><B>To:</B> Brian DeForest; Larry Scheer; =
Andy=20
Sharp; Charissa Willard<BR><B>Cc:</B> Sandrine =
Boulanger<BR><B>Subject:</B>=20
Developers doing their own merges to Release =
branches<BR></FONT><BR></DIV>
<DIV></DIV>
<DIV class=3DSection1>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">NOTE: Please review this =
email I&#8217;m=20
poised to send out synchronous with Zonda sub12. Please send me any =
feedback=20
and/or corrections and I&#8217;ll add them, thanks all.=20
-Ken<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">Hi =
all.<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">Starting with Zonda =
project and=20
submittal 12 individual developers will be responsible for merging their =
own=20
Must-Fix defects into the Zonda release branch R3_1_0_rel. This is to =
facilitate=20
spreading the merge load across dev instead of me doing them all, and in =
the=20
case of merge conflicts the proper person is there looking at the code =
to get it=20
massaged and working. <o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">Basically, process-wise =
all you need=20
to do is when you close a Zonda must-fix defect, you must do one =
additional step=20
of merging the change into the release branch. The instructions for =
doing so are=20
listed below, both for the P4 CLI &nbsp;and for P4V. In either case if =
you have=20
any trouble or questions please feel free to ask me for=20
help.<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<DIV=20
style=3D"BORDER-RIGHT: medium none; PADDING-RIGHT: 0in; BORDER-TOP: =
medium none; PADDING-LEFT: 0in; PADDING-BOTTOM: 1pt; BORDER-LEFT: medium =
none; PADDING-TOP: 0in; BORDER-BOTTOM: windowtext 1pt solid; =
mso-element: para-border-div">
<P class=3DMsoNormal=20
style=3D"BORDER-RIGHT: medium none; PADDING-RIGHT: 0in; BORDER-TOP: =
medium none; PADDING-LEFT: 0in; PADDING-BOTTOM: 0in; BORDER-LEFT: medium =
none; PADDING-TOP: 0in; BORDER-BOTTOM: medium none"><FONT=20
face=3DArial size=3D2><SPAN style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial">HOWTO: Merge=20
a single changelist from the dev branch into the R3_1_0_rel branch using =
the=20
Perforce CLI<o:p></o:p></SPAN></FONT></P></DIV>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">Assume changelist 12345 =
needs to be=20
merged over:<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-p4 integrate &#8211;i =
&#8211;d=20
//depot/dev/&#8230;@12345,@12345 =
//depot/3_1_0_rel/&#8230;<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-p4=20
resolve<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-p4=20
submit<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<DIV=20
style=3D"BORDER-RIGHT: medium none; PADDING-RIGHT: 0in; BORDER-TOP: =
medium none; PADDING-LEFT: 0in; PADDING-BOTTOM: 1pt; BORDER-LEFT: medium =
none; PADDING-TOP: 0in; BORDER-BOTTOM: windowtext 1pt solid; =
mso-element: para-border-div">
<P class=3DMsoNormal=20
style=3D"BORDER-RIGHT: medium none; PADDING-RIGHT: 0in; BORDER-TOP: =
medium none; PADDING-LEFT: 0in; PADDING-BOTTOM: 0in; BORDER-LEFT: medium =
none; PADDING-TOP: 0in; BORDER-BOTTOM: medium none"><FONT=20
face=3DArial size=3D2><SPAN style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial">HOWTO: Merge=20
a single changelist from the dev branch into the R3_1_0_rel branch using =
the=20
Perforce visual client P4V<o:p></o:p></SPAN></FONT></P></DIV>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">NOTE: There are at least 3 =
or 4 ways=20
to do this in the UI, this is probably the most direct=20
method.<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">Assume changelist 12345 =
needs to be=20
merged over:<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-From P4V with your =
current client=20
for the dev branch opened, select View-&gt;Submitted Changelists to get =
a list=20
of recent checkins to the dev branch.<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-Right-click on your =
changelist and=20
select &#8220;Integrate using Submitted Changelist=20
&#8220;25527&#8221;<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-In the pop-up box, change =
the=20
Target path to point to R3_1_0_rel instead of =
dev<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-Click Preview if desired, =
or just=20
Integrate to perform the integration<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-Select the Pending =
changelist tab=20
in the right window pane, Right-click on the &#8216;default&#8217; =
changelist and select=20
&#8220;Resolve files&#8230;&#8221;<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-Based on what you see you =
can=20
either select one of the auto-merge functions or just click on =
&#8220;Run Merge Tool&#8221;=20
to bring up the 3-way, color-coded diffing/resolution=20
tool<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-Select the appropriate =
code blocks=20
for the merge, select File-&gt;Exit when finished, and confirm that you =
want to=20
use this edited version of the file.<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-Right-click again on the =
&#8216;default&#8217;=20
changelist and this time select &#8220;Submit&#8221; to complete the=20
submission.<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">The process looks =
cumbersome but is=20
intuitive once you grasp the integrate/resolve/submit cycle, but the CLI =
variant=20
is obviously a little more direct.<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial">Thanks,<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial">-Ken<o:p></o:p></SPAN></FONT></P>
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN=20
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"><o:p>&nbsp;</o:p></SPAN></FONT></P></DIV></BODY></HTML>

------_=_NextPart_001_01C7FBC6.127BC664--
