X-MimeOLE: Produced By Microsoft Exchange V6.5
Received: by onstor-exch02.onstor.net 
	id <01C7FC07.A433B945@onstor-exch02.onstor.net>; Thu, 20 Sep 2007 20:26:55 -0800
MIME-Version: 1.0
Content-Type: multipart/alternative;
	boundary="----_=_NextPart_001_01C7FC07.A433B945"
Content-class: urn:content-classes:message
Subject: RE: Developers doing their own merges to Release branches
Date: Thu, 20 Sep 2007 20:24:59 -0800
Message-ID: <BB375AF679D4A34E9CA8DFA650E2B04E02F3D841@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+6GYEfc3BTuQAQXW5NAACMjw4=
References: <6041AEBD8A3E264785ABDA2F60B52DB45FCF07ED@onstor-exch02.onstor.net> <BB375AF679D4A34E9CA8DFA650E2B04E02F3D83D@onstor-exch02.onstor.net>
From: "Ken Renshaw" <ken.renshaw@onstor.com>
To: "Ken Renshaw" <ken.renshaw@onstor.com>,
	"dl-Engineering" <dl-engineering@onstor.com>

This is a multi-part message in MIME format.

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

As I was just reminded of, there is a typo in the p4 integrate path. =
It's supposed to be R3_1_0_rel and not 3_1_0_rel, so the commands for =
CLI integration should be:
=20

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

-p4 resolve

-p4 submit

=20
Thanks,
=20
-Ken
=20

________________________________

From: Ken Renshaw
Sent: Thu 9/20/2007 9:16 PM
To: dl-Engineering
Subject: Developers doing their own merges to Release branches


Hi all.

=20

Starting now with any checkins done after submittal 12 ( P4 25540 is the =
cuttoff point ) 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 em masse, and in the case of merge conflicts the proper =
person is already there looking at the code to fix it.

=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, what follows =
is probably the most direct method.

=20

NOTE2: Please double-check that your p4v merge tool setup is configured =
to honor all whitespace during merges. You have to actually launch =
either the visual merge or diff tools from within P4V and edit the menu =
preferences there.

=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, and the CLI variant is obviously a =
little more direct.

=20

Thanks,

=20

-Ken

=20


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

<HTML dir=3Dltr><HEAD>=0A=
<META http-equiv=3DContent-Type content=3D"text/html; charset=3Dunicode">=0A=
<META content=3D"MSHTML 6.00.5730.11" name=3DGENERATOR>=0A=
<STYLE>=0A=
<!--=0A=
                        =0A=
 p.MsoNormal, li.MsoNormal, div.MsoNormal=0A=
	{margin:0in;=0A=
	margin-bottom:.0001pt;=0A=
	font-size:12.0pt;=0A=
	font-family:"Times New Roman";}=0A=
a:link, span.MsoHyperlink=0A=
	{color:blue;=0A=
	text-decoration:underline;}=0A=
a:visited, span.MsoHyperlinkFollowed=0A=
	{color:purple;=0A=
	text-decoration:underline;}=0A=
span.EmailStyle17=0A=
	{=0A=
	font-family:Arial;=0A=
	color:windowtext;}=0A=
=0A=
div.Section1=0A=
	{page:Section1;}=0A=
-->=0A=
</STYLE>=0A=
</HEAD>=0A=
<BODY lang=3DEN-US vLink=3Dpurple link=3Dblue>=0A=
<DIV id=3DidOWAReplyText20799 dir=3Dltr>=0A=
<DIV dir=3Dltr><FONT face=3DArial color=3D#000000 size=3D2>As I was just =
reminded of, there is a typo in the p4 integrate path. It's supposed to =
be&nbsp;R3_1_0_rel and not 3_1_0_rel, so the commands for CLI =
integration should be:</FONT></DIV>=0A=
<DIV dir=3Dltr><FONT face=3DArial size=3D2></FONT>&nbsp;</DIV>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-p4 integrate &#8211;i =
&#8211;d //depot/dev/&#8230;@12345,@12345 =
//depot/R3_1_0_rel/&#8230;</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-p4 =
resolve</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-p4 =
submit</SPAN></FONT></P>=0A=
<DIV dir=3Dltr><FONT face=3DArial size=3D2></FONT>&nbsp;</DIV>=0A=
<DIV dir=3Dltr><FONT face=3DArial size=3D2>Thanks,</FONT></DIV>=0A=
<DIV dir=3Dltr><FONT face=3DArial size=3D2></FONT>&nbsp;</DIV>=0A=
<DIV dir=3Dltr><FONT face=3DArial size=3D2>-Ken</FONT></DIV>=0A=
<DIV dir=3Dltr><FONT face=3DArial size=3D2></FONT>&nbsp;</DIV></DIV>=0A=
<DIV dir=3Dltr><BR>=0A=
<HR tabIndex=3D-1>=0A=
<FONT face=3DTahoma size=3D2><B>From:</B> Ken Renshaw<BR><B>Sent:</B> =
Thu 9/20/2007 9:16 PM<BR><B>To:</B> dl-Engineering<BR><B>Subject:</B> =
Developers doing their own merges to Release =
branches<BR></FONT><BR></DIV>=0A=
<DIV dir=3Dltr>=0A=
<DIV id=3DidOWAReplyText75887 dir=3Dltr>=0A=
<DIV dir=3Dltr><FONT face=3DArial size=3D2><SPAN style=3D"FONT-SIZE: =
10pt; FONT-FAMILY: Arial">Hi all.</SPAN></FONT></DIV></DIV>=0A=
<DIV>=0A=
<DIV class=3DSection1>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">Starting now with any =
checkins done after submittal 12 ( P4 25540 is the cuttoff point =
)&nbsp;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 em masse, and in the case of merge conflicts the proper person is =
already there looking at the code to fix it.</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; 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.</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<DIV 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">=0A=
<P class=3DMsoNormal 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 face=3DArial size=3D2><SPAN style=3D"FONT-SIZE: 10pt; =
FONT-FAMILY: Arial">HOWTO: Merge a single changelist from the dev branch =
into the R3_1_0_rel branch using the Perforce CLI</SPAN></FONT></P></DIV>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">Assume changelist 12345 =
needs to be merged over:</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-p4 integrate &#8211;i =
&#8211;d //depot/dev/&#8230;@12345,@12345 =
//depot/3_1_0_rel/&#8230;</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-p4 =
resolve</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-p4 =
submit</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<DIV 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">=0A=
<P class=3DMsoNormal 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 face=3DArial size=3D2><SPAN style=3D"FONT-SIZE: 10pt; =
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</SPAN></FONT></P></DIV>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">NOTE: There are at least 3 =
or 4 ways to do this in the UI,&nbsp;what follows&nbsp;is probably the =
most direct method.</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">NOTE2: Please double-check =
that your p4v merge tool setup is configured to honor all whitespace =
during merges. You have to actually launch either the visual merge or =
diff tools from within P4V and edit the menu preferences =
there.</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">Assume changelist 12345 =
needs to be merged over:</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; 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.</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-Right-click on your =
changelist and select &#8220;Integrate using Submitted Changelist =
&#8220;25527&#8221;</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-In the pop-up box, change =
the Target path to point to R3_1_0_rel instead of dev</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-Click Preview if desired, =
or just Integrate to perform the integration</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; 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;</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; 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</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; 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.</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-Right-click again on the =
&#8216;default&#8217; changelist and this time select =
&#8220;Submit&#8221; to complete the submission.</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">The process looks =
cumbersome but is intuitive once you grasp the integrate/resolve/submit =
cycle,&nbsp;and the CLI variant is obviously a little more =
direct.</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">Thanks,</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial"></SPAN></FONT>&nbsp;</P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: Arial">-Ken</SPAN></FONT></P>=0A=
<P class=3DMsoNormal><FONT face=3DArial size=3D2><SPAN =
style=3D"FONT-SIZE: 10pt; FONT-FAMILY: =
Arial"></SPAN></FONT>&nbsp;</P></DIV></DIV></DIV></BODY></HTML>
------_=_NextPart_001_01C7FC07.A433B945--
