X-MimeOLE: Produced By Microsoft Exchange V6.5
Received: by onstor-exch02.onstor.net 
	id <01C7FCCD.93EE5582@onstor-exch02.onstor.net>; Fri, 21 Sep 2007 20:03:48 -0800
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Content-class: urn:content-classes:message
Subject: RE: Developers doing their own merges to Release branches
Date: Fri, 21 Sep 2007 20:03:48 -0800
Message-ID: <BB375AF679D4A34E9CA8DFA650E2B04E05A25A85@onstor-exch02.onstor.net>
In-Reply-To: <20070921183632.45fd1807@ripper.onstor.net>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: Developers doing their own merges to Release branches
Thread-Index: Acf8uQI78X6aMI9gTMaaSvBjiv5/6QAE1YQg
References: <6041AEBD8A3E264785ABDA2F60B52DB45FCF07ED@onstor-exch02.onstor.net><BB375AF679D4A34E9CA8DFA650E2B04E02F3D83D@onstor-exch02.onstor.net><BB375AF679D4A34E9CA8DFA650E2B04E02F3D841@onstor-exch02.onstor.net> <20070921183632.45fd1807@ripper.onstor.net>
From: "Brian DeForest" <brian.deforest@onstor.com>
To: "Andy Sharp" <andy.sharp@onstor.com>

Agreed. =20

-----Original Message-----
From: Andy Sharp=20
Sent: Friday, September 21, 2007 6:37 PM
To: Ken Renshaw
Cc: dl-Engineering
Subject: Re: Developers doing their own merges to Release branches

As the resident perforce submit comment pester-monkey, I've been told
that the following should be added to these instructions:

Don't forget that the submit comment conventions still apply.  So,
checkin comments like this one from (no names, only initials -- Ron
Bhanukitsiri) don't suffice:



Change 25564 by ronb@ronb-depot-local on 2007/09/21 18:00:49

	Reviewed by: briand
=09
	Merge in fix for TED 20573 from dev branch (CL 25555)



Arr, as this is yer first offense we won't be swingin' ya' from the yard
arm.  Six months from now if you were investigating changes to this file
in this branch you would have no clue; you would have to waste time
doing a p4 describe on cl25555 or worse yet, firing up clearcrap.

General rule of thumb for integrate comments: it's ok to cut & paste the
original comment if that comment was sufficient.  Ken switched to doing
just that several months ago and I've already found it to be hella more
useful than the above style comment.  That's right, hella.

Remember, the life you save may be your own.

Thank you; drive through.

a

PS I chose to pick on Ron because I know he's always such a good sport.


On Thu, 20 Sep 2007 21:24:59 -0700 "Ken Renshaw"
<ken.renshaw@onstor.com> wrote:

> 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=20
> CLI integration should be:
>=20
> -p4 integrate -i
> -d //depot/dev/...@12345,@12345 //depot/R3_1_0_rel/...
>=20
> -p4 resolve
>=20
> -p4 submit
>=20
> =20
> Thanks,
> =20
> -Ken
> =20
>=20
> ________________________________
>=20
> From: Ken Renshaw
> Sent: Thu 9/20/2007 9:16 PM
> To: dl-Engineering
> Subject: Developers doing their own merges to Release branches
>=20
>=20
> Hi all.
>=20
> =20
>=20
> Starting now with any checkins done after submittal 12 ( P4 25540 is=20
> the cuttoff point ) individual developers will be responsible for=20
> merging their own Must-Fix defects into the Zonda release branch=20
> R3_1_0_rel. This is to facilitate spreading the merge load across dev=20
> instead of me doing them all em masse, and in the case of merge=20
> conflicts the proper person is already there looking at the code to=20
> fix it.
>=20
> =20
>=20
> Basically, process-wise all you need to do is when you close a Zonda=20
> must-fix defect, you must do one additional step of merging the change

> into the release branch. The instructions for doing so are listed=20
> below, both for the P4 CLI  and for P4V. In either case if you have=20
> any trouble or questions please feel free to ask me for help.
>=20
> =20
>=20
> HOWTO: Merge a single changelist from the dev branch into the=20
> R3_1_0_rel branch using the Perforce CLI
>=20
> =20
>=20
> Assume changelist 12345 needs to be merged over:
>=20
> =20
>=20
> -p4 integrate -i -d //depot/dev/...@12345,@12345 //depot/3_1_0_rel/...
>=20
> -p4 resolve
>=20
> -p4 submit
>=20
> =20
>=20
> =20
>=20
> HOWTO: Merge a single changelist from the dev branch into the=20
> R3_1_0_rel branch using the Perforce visual client P4V
>=20
> =20
>=20
> NOTE: There are at least 3 or 4 ways to do this in the UI, what=20
> follows is probably the most direct method.
>=20
> =20
>=20
> NOTE2: Please double-check that your p4v merge tool setup is=20
> configured to honor all whitespace during merges. You have to actually

> launch either the visual merge or diff tools from within P4V and edit=20
> the menu preferences there.
>=20
> =20
>=20
> Assume changelist 12345 needs to be merged over:
>=20
> =20
>=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
> =20
>=20
> -Right-click on your changelist and select "Integrate using Submitted=20
> Changelist "25527"
>=20
> =20
>=20
> -In the pop-up box, change the Target path to point to R3_1_0_rel=20
> instead of dev
>=20
> =20
>=20
> -Click Preview if desired, or just Integrate to perform the=20
> integration
>=20
> =20
>=20
> -Select the Pending changelist tab in the right window pane,=20
> Right-click on the 'default' changelist and select "Resolve files..."
>=20
> =20
>=20
> -Based on what you see you can either select one of the auto-merge=20
> functions or just click on "Run Merge Tool" to bring up the 3-way,=20
> color-coded diffing/resolution tool
>=20
> =20
>=20
> -Select the appropriate code blocks for the merge, select File->Exit=20
> when finished, and confirm that you want to use this edited version of

> the file.
>=20
> =20
>=20
> -Right-click again on the 'default' changelist and this time select=20
> "Submit" to complete the submission.
>=20
> =20
>=20
> The process looks cumbersome but is intuitive once you grasp the=20
> integrate/resolve/submit cycle, and the CLI variant is obviously a=20
> little more direct.
>=20
> =20
>=20
> Thanks,
>=20
> =20
>=20
> -Ken
>=20
> =20
>=20
