X-MimeOLE: Produced By Microsoft Exchange V6.5
Received: by onstor-exch02.onstor.net 
	id <01C828AE.14AF7460@onstor-exch02.onstor.net>; Fri, 16 Nov 2007 16:09:11 -0800
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-class: urn:content-classes:message
Subject: RE: Rocket98 Release Branch has been created
Date: Fri, 16 Nov 2007 16:08:56 -0800
Message-ID: <BB375AF679D4A34E9CA8DFA650E2B04E06A7BD98@onstor-exch02.onstor.net>
In-Reply-To: <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/TqKuJDOYbF8Z7wAK+yEA
References: <BB375AF679D4A34E9CA8DFA650E2B04E02F3DBA3@onstor-exch02.onstor.net>
From: "Brian DeForest" <brian.deforest@onstor.com>
To: "dl-Software" <dl-software@onstor.com>

As Ken mentioned, for the time being all R98 and 3.1.0.x checkins will =
be checked into the 'dev' branch first, then merged into the 'r320rel' =
branch.  In the near future we will restrict checkins are merged from =
'dev' into the 'r320rel' branch.   =20

-----Original Message-----
From: Ken Renshaw=20
Sent: Friday, November 16, 2007 2:40 PM
To: dl-Engineering
Subject: Rocket98 Release Branch has been created

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

