X-MimeOLE: Produced By Microsoft Exchange V6.5
Received: by onstor-exch02.onstor.net 
	id <01C7FBCB.1DE08CD3@onstor-exch02.onstor.net>; Thu, 20 Sep 2007 13:13:40 -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: Thu, 20 Sep 2007 13:13:39 -0800
Message-ID: <BB375AF679D4A34E9CA8DFA650E2B04E05A2525D@onstor-exch02.onstor.net>
In-Reply-To: <20070920141012.645971f8@ripper.onstor.net>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: Developers doing their own merges to Release branches
Thread-Index: Acf7yqJsqCdoUAJXQoClYUmmf1F6uwAADZlg
References: <BB375AF679D4A34E9CA8DFA650E2B04E05A25216@onstor-exch02.onstor.net><BB375AF679D4A34E9CA8DFA650E2B04E05A25220@onstor-exch02.onstor.net><BB375AF679D4A34E9CA8DFA650E2B04E05A25237@onstor-exch02.onstor.net> <20070920141012.645971f8@ripper.onstor.net>
From: "Maxim Kozlovsky" <maxim.kozlovsky@onstor.com>
To: "Andy Sharp" <andy.sharp@onstor.com>,
	"Brian DeForest" <brian.deforest@onstor.com>
Cc: "Ken Renshaw" <ken.renshaw@onstor.com>,
	"Larry Scheer" <larry.scheer@onstor.com>,
	"Charissa Willard" <charissa.willard@onstor.com>,
	"Chris Vandever" <chris.vandever@onstor.com>,
	"Jonathan Goldick" <jonathan.goldick@onstor.com>,
	"Sandrine Boulanger" <sandrine.boulanger@onstor.com>

There is an alternative of keeping the current naming conventions and
ordering the guitar and piano classes for everybody. Even marketing will
not be able to match the fun we are going to have.

>-----Original Message-----
>From: Andy Sharp
>Sent: Thursday, September 20, 2007 2:10 PM
>To: Brian DeForest
>Cc: Ken Renshaw; Maxim Kozlovsky; Larry Scheer; Charissa Willard; Chris
>Vandever; Jonathan Goldick; Sandrine Boulanger
>Subject: Re: Developers doing their own merges to Release branches
>
>On Thu, 20 Sep 2007 14:01:22 -0700 "Brian DeForest"
><brian.deforest@onstor.com> wrote:
>
>> Agree on the naming convention -- lowercase and no underscores.   My
>> gripe from day 1.
>
>Me three.
>
>> ________________________________
>>
>> From: Ken Renshaw
>> Sent: Thursday, September 20, 2007 1:54 PM
>> To: Maxim Kozlovsky; Brian DeForest; Larry Scheer; Andy Sharp;
>> Charissa Willard; Chris Vandever; Jonathan Goldick
>> Cc: Sandrine Boulanger
>> Subject: RE: Developers doing their own merges to Release branches
>>
>>
>>
>> 1) Because the dev branch and release branch straddle main. There is
a
>> common source base but the fact you're leapfrogging main requires the
>> -i flag.
>>
>>
>>
>> 2) You're correct in the typo, I'll fix that.
>>
>>
>>
>> 3) I play guitar and piano so I don't have those issues, but I'll try
>> and accommodate you on that Max. I personally use caps as visual
focus
>> tokens as it makes it easier to pick things out, but that's probably
>> just me. I'll use names like rocket98 and 320rel or rocket98rel from
>> now on . People's preferences here?
>>
>>
>>
>> Thanks,
>>
>>
>>
>> -Ken
>>
>> ________________________________
>>
>> From: Maxim Kozlovsky
>> Sent: Thursday, September 20, 2007 1:49 PM
>> To: Brian DeForest; Ken Renshaw; Larry Scheer; Andy Sharp; Charissa
>> Willard; Chris Vandever; Jonathan Goldick
>> Cc: Sandrine Boulanger
>> Subject: RE: Developers doing their own merges to Release branches
>>
>>
>>
>> Why the merge has to be indirect? We should have a common merge base.
>>
>>
>>
>> There is an error in the p4 command, the name of the branch is
>> R3_1_0_rel.
>>
>>
>>
>> (By the way, can you stop putting the capital letters and underscores
>> in the branch names? The fingers really start to hurt when you have
to
>> press shift 4 times to type 8 characters).
>>
>>
>>
>> ________________________________
>>
>> From: Brian DeForest
>> Sent: Thursday, September 20, 2007 1:38 PM
>> To: Ken Renshaw; Larry Scheer; Andy Sharp; Charissa Willard; Chris
>> Vandever; Maxim Kozlovsky; Jonathan Goldick
>> Cc: Sandrine Boulanger
>> Subject: RE: Developers doing their own merges to Release branches
>>
>>
>>
>> Adding a few more people to preview this.
>>
>>
>>
>> Will this properly preserve white space changes?
>>
>>
>>
>> ________________________________
>>
>> From: Ken Renshaw
>> Sent: Thursday, September 20, 2007 1:21 PM
>> To: Brian DeForest; Larry Scheer; Andy Sharp; Charissa Willard
>> Cc: Sandrine Boulanger
>> Subject: Developers doing their own merges to Release branches
>>
>> 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
>>
>>
>>
>> Hi all.
>>
>>
>>
>> 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.
>>
>>
>>
>> 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.
>>
>>
>>
>> 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 -i -d //depot/dev/...@12345,@12345
//depot/3_1_0_rel/...
>>
>> -p4 resolve
>>
>> -p4 submit
>>
>>
>>
>>
>>
>> HOWTO: Merge a single changelist from the dev branch into the
>> R3_1_0_rel branch using the Perforce visual client P4V
>>
>>
>>
>> NOTE: There are at least 3 or 4 ways to do this in the UI, this is
>> probably the most direct method.
>>
>>
>>
>> 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 "Integrate using Submitted
>> Changelist "25527"
>>
>>
>>
>> -In the pop-up box, change the Target path to point to R3_1_0_rel
>> 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 'default' changelist and select "Resolve files..."
>>
>>
>>
>> -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
>>
>>
>>
>> -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 'default' changelist and this time select
>> "Submit" to complete the submission.
>>
>>
>>
>> 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.
>>
>>
>>
>> Thanks,
>>
>>
>>
>> -Ken
>>
>>
>>
