X-MimeOLE: Produced By Microsoft Exchange V6.5
Received: by onstor-exch02.onstor.net 
	id <01C7FBC3.B72CCCF9@onstor-exch02.onstor.net>; Thu, 20 Sep 2007 12:20:41 -0800
MIME-Version: 1.0
Content-Type: multipart/alternative;
	boundary="----_=_NextPart_001_01C7FBC3.B72CCCF9"
Content-class: urn:content-classes:message
Subject: Developers doing their own merges to Release branches
Date: Thu, 20 Sep 2007 12:20:41 -0800
Message-ID: <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+6GYEfc3BTuQ==
From: "Ken Renshaw" <ken.renshaw@onstor.com>
To: "Brian DeForest" <brian.deforest@onstor.com>,
	"Larry Scheer" <larry.scheer@onstor.com>,
	"Andy Sharp" <andy.sharp@onstor.com>,
	"Charissa Willard" <charissa.willard@onstor.com>
Cc: "Sandrine Boulanger" <sandrine.boulanger@onstor.com>

This is a multi-part message in MIME format.

------_=_NextPart_001_01C7FBC3.B72CCCF9
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

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_01C7FBC3.B72CCCF9
Content-Type: text/html;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

<html xmlns:o=3D"urn:schemas-microsoft-com:office:office" =
xmlns:w=3D"urn:schemas-microsoft-com:office:word" =
xmlns=3D"http://www.w3.org/TR/REC-html40">

<head>
<meta http-equiv=3DContent-Type content=3D"text/html; =
charset=3Dus-ascii">
<meta name=3DGenerator content=3D"Microsoft Word 11 (filtered medium)">
<style>
<!--
 /* Style Definitions */
 p.MsoNormal, li.MsoNormal, div.MsoNormal
	{margin:0in;
	margin-bottom:.0001pt;
	font-size:12.0pt;
	font-family:"Times New Roman";}
a:link, span.MsoHyperlink
	{color:blue;
	text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
	{color:purple;
	text-decoration:underline;}
span.EmailStyle17
	{mso-style-type:personal-compose;
	font-family:Arial;
	color:windowtext;}
@page Section1
	{size:8.5in 11.0in;
	margin:1.0in 1.25in 1.0in 1.25in;}
div.Section1
	{page:Section1;}
-->
</style>

</head>

<body lang=3DEN-US link=3Dblue vlink=3Dpurple>

<div class=3DSection1>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>NOTE: Please review this email I&#8217;m poised to =
send out synchronous
with Zonda sub12. Please send me any feedback and/or corrections and =
I&#8217;ll
add them, thanks all. -Ken<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>Hi all.<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>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. =
<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>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 &nbsp;and for P4V. In either case if you have any trouble or =
questions please
feel free to ask me for help.<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<div =
style=3D'mso-element:para-border-div;border:none;border-bottom:solid =
windowtext 1.0pt;
padding:0in 0in 1.0pt 0in'>

<p class=3DMsoNormal style=3D'border:none;padding:0in'><font size=3D2 =
face=3DArial><span
style=3D'font-size:10.0pt;font-family:Arial'>HOWTO: Merge a single =
changelist from
the dev branch into the R3_1_0_rel branch using the Perforce =
CLI<o:p></o:p></span></font></p>

</div>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>Assume changelist 12345 needs to be merged =
over:<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>-p4 integrate &#8211;i &#8211;d =
//depot/dev/&#8230;@12345,@12345
//depot/3_1_0_rel/&#8230;<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>-p4 resolve<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>-p4 submit<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<div =
style=3D'mso-element:para-border-div;border:none;border-bottom:solid =
windowtext 1.0pt;
padding:0in 0in 1.0pt 0in'>

<p class=3DMsoNormal style=3D'border:none;padding:0in'><font size=3D2 =
face=3DArial><span
style=3D'font-size:10.0pt;font-family:Arial'>HOWTO: Merge a single =
changelist from
the dev branch into the R3_1_0_rel branch using the Perforce visual =
client P4V<o:p></o:p></span></font></p>

</div>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>NOTE: There are at least 3 or 4 ways to do this in =
the UI, this
is probably the most direct method.<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>Assume changelist 12345 needs to be merged =
over:<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>-From P4V with your current client for the dev branch =
opened,
select View-&gt;Submitted Changelists to get a list of recent checkins =
to the dev
branch.<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>-Right-click on your changelist and select =
&#8220;Integrate using
Submitted Changelist &#8220;25527&#8221;<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>-In the pop-up box, change the Target path to point =
to R3_1_0_rel
instead of dev<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>-Click Preview if desired, or just Integrate to =
perform the integration<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>-Select the Pending changelist tab in the right =
window pane,
Right-click on the &#8216;default&#8217; changelist and select =
&#8220;Resolve files&#8230;&#8221;<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>-Based on what you see you can either select one of =
the auto-merge
functions or just click on &#8220;Run Merge Tool&#8221; to bring up the =
3-way, color-coded
diffing/resolution tool<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>-Select the appropriate code blocks for the merge, =
select File-&gt;Exit
when finished, and confirm that you want to use this edited version of =
the file.<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>-Right-click again on the &#8216;default&#8217; =
changelist and
this time select &#8220;Submit&#8221; to complete the =
submission.<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>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.<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>Thanks,<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'>-Ken<o:p></o:p></span></font></p>

<p class=3DMsoNormal><font size=3D2 face=3DArial><span =
style=3D'font-size:10.0pt;
font-family:Arial'><o:p>&nbsp;</o:p></span></font></p>

</div>

</body>

</html>

------_=_NextPart_001_01C7FBC3.B72CCCF9--
