AF:
NF:0
PS:10
SRH:1
SFN:
DSR:
MID:
CFG:
PT:0
S:andy.sharp@onstor.com
RQ:
SSV:onstor-exch02.onstor.net
NSV:
SSH:
R:<eric.barrett@onstor.com>
MAID:1
X-Sylpheed-Privacy-System:
X-Sylpheed-Sign:0
SCF:#mh/Mailbox/sent
RMID:#imap/andys@onstor.net@onstor-exch02.onstor.net/INBOX	0	BB375AF679D4A34E9CA8DFA650E2B04E05B460FF@onstor-exch02.onstor.net
X-Sylpheed-End-Special-Headers: 1
Date: Mon, 24 Sep 2007 10:26:09 -0700
From: Andrew Sharp <andy.sharp@onstor.com>
To: "Eric Barrett" <eric.barrett@onstor.com>
Subject: Re: Developers doing their own merges to Release branches
Message-ID: <20070924102609.3f6f291a@ripper.onstor.net>
In-Reply-To: <BB375AF679D4A34E9CA8DFA650E2B04E05B460FF@onstor-exch02.onstor.net>
References: <20070921183632.45fd1807@ripper.onstor.net>
	<BB375AF679D4A34E9CA8DFA650E2B04E05B460FF@onstor-exch02.onstor.net>
Organization: Onstor
X-Mailer: Sylpheed-Claws 2.6.0 (GTK+ 2.8.20; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

Doh!

On Mon, 24 Sep 2007 10:15:05 -0700 "Eric Barrett"
<eric.barrett@onstor.com> wrote:

> $10, please.  I trademarked "Clearcrap" years ago, and there's a
> royalty on it now.
>  
> 
> -----Original Message-----
> From: Andy Sharp 
> 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
> 	
> 	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 CLI integration should be: 
> > 
> > -p4 integrate -i
> > -d //depot/dev/...@12345,@12345 //depot/R3_1_0_rel/...
> > 
> > -p4 resolve
> > 
> > -p4 submit
> > 
> >  
> > Thanks,
> >  
> > -Ken
> >  
> > 
> > ________________________________
> > 
> > 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.
> > 
> >  
> > 
> > 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.
> > 
> >  
> > 
> > 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, 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 "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, and the CLI variant is obviously a
> > little more direct.
> > 
> >  
> > 
> > Thanks,
> > 
> >  
> > 
> > -Ken
> > 
> >  
> > 
