X-MimeOLE: Produced By Microsoft Exchange V6.5
Received: by onstor-exch02.onstor.net 
	id <01C828A1.AE589487@onstor-exch02.onstor.net>; Fri, 16 Nov 2007 14:40:25 -0800
MIME-Version: 1.0
Content-Type: multipart/alternative;
	boundary="----_=_NextPart_001_01C828A1.AE589487"
Content-class: urn:content-classes:message
Subject: Rocket98 Release Branch has been created
Date: Fri, 16 Nov 2007 14:40:25 -0800
Message-ID: <BB375AF679D4A34E9CA8DFA650E2B04E02F3DBA3@onstor-exch02.onstor.net>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: Rocket98 Release Branch has been created
Thread-Index: AcgogX4A+DV6Q6s/TqKuJDOYbF8Z7w==
From: "Ken Renshaw" <ken.renshaw@onstor.com>
To: "dl-Engineering" <dl-engineering@onstor.com>

This is a multi-part message in MIME format.

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

Hi all, it's that time again...I've create the Rocket98 release branch, =
called r320rel, and am setting up nightly builds for it as well as the =
dev branch.

The client spec for this would look something like:

View:
    //depot/r320rel/... //depot/yourclient/r320rel/...

All changes being done for R98 need to be coded in the dev branch as =
usual and merged into the r32-rel branch. This goes for non-must-fix as =
well as must-fix defects since we have not yet closed the gate to NMFs.

Starting with any checkins done after changelist P4 26399 this morning =
individual developers will be responsible for merging their own defects =
into the Rocket98 release branch r320rel.

Basically, process-wise all you need to do is when you close a Rocket98 =
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.

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

Assume changelist 12345 needs to be merged over:

-p4 integrate =96i =96d //depot/dev/=85@12345,@12345 //depot/r320rel/=85

-p4 resolve

-p4 submit

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

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

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.

Assume changelist 12345 needs to be merged over:

-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.

-Right-click on your changelist and select =93Integrate using Submitted =
Changelist =9325527=94

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

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

-Select the Pending changelist tab in the right window pane, Right-click =
on the =91default=92 changelist and select =93Resolve files=85=94

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

-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.

-Right-click again on the =91default=92 changelist and this time select =
=93Submit=94 to complete the submission.

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.

Thanks, and please let me know if there are any questions, or ask your =
manager about it.

-Ken


------_=_NextPart_001_01C828A1.AE589487
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>Rocket98 Release Branch has been created</TITLE>
</HEAD>
<BODY>
<!-- Converted from text/plain format -->

<P><FONT SIZE=3D2>Hi all, it's that time again...I've create the =
Rocket98 release branch, called r320rel, and am setting up nightly =
builds for it as well as the dev branch.<BR>
<BR>
The client spec for this would look something like:<BR>
<BR>
View:<BR>
&nbsp;&nbsp;&nbsp; //depot/r320rel/... =
//depot/yourclient/r320rel/...<BR>
<BR>
All changes being done for R98 need to be coded in the dev branch as =
usual and merged into the r32-rel branch. This goes for non-must-fix as =
well as must-fix defects since we have not yet closed the gate to =
NMFs.<BR>
<BR>
Starting with any checkins done after changelist P4 26399 this morning =
individual developers will be responsible for merging their own defects =
into the Rocket98 release branch r320rel.<BR>
<BR>
Basically, process-wise all you need to do is when you close a Rocket98 =
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.<BR>
<BR>
HOWTO: Merge a single changelist from the dev branch into the R3_1_0_rel =
branch using the Perforce CLI<BR>
<BR>
Assume changelist 12345 needs to be merged over:<BR>
<BR>
-p4 integrate &#150;i &#150;d //depot/dev/&#133;@12345,@12345 =
//depot/r320rel/&#133;<BR>
<BR>
-p4 resolve<BR>
<BR>
-p4 submit<BR>
<BR>
HOWTO: Merge a single changelist from the dev branch into the r320rel =
branch using the Perforce visual client P4V<BR>
<BR>
NOTE: There are at least 3 or 4 ways to do this in the UI, what follows =
is probably the most direct method.<BR>
<BR>
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.<BR>
<BR>
Assume changelist 12345 needs to be merged over:<BR>
<BR>
-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.<BR>
<BR>
-Right-click on your changelist and select &#147;Integrate using =
Submitted Changelist &#147;25527&#148;<BR>
<BR>
-In the pop-up box, change the Target path to point to r320rel instead =
of dev<BR>
<BR>
-Click Preview if desired, or just Integrate to perform the =
integration<BR>
<BR>
-Select the Pending changelist tab in the right window pane, Right-click =
on the &#145;default&#146; changelist and select &#147;Resolve =
files&#133;&#148;<BR>
<BR>
-Based on what you see you can either select one of the auto-merge =
functions or just click on &#147;Run Merge Tool&#148; to bring up the =
3-way, color-coded diffing/resolution tool<BR>
<BR>
-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.<BR>
<BR>
-Right-click again on the &#145;default&#146; changelist and this time =
select &#147;Submit&#148; to complete the submission.<BR>
<BR>
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.<BR>
<BR>
Thanks, and please let me know if there are any questions, or ask your =
manager about it.<BR>
<BR>
-Ken<BR>
<BR>
</FONT>
</P>

</BODY>
</HTML>
------_=_NextPart_001_01C828A1.AE589487--
