AF:
NF:0
PS:10
SRH:1
SFN:
DSR:
MID:<20071017111432.1eaf8a99@ripper.onstor.net>
CFG:
PT:0
S:andy.sharp@onstor.com
RQ:
SSV:onstor-exch02.onstor.net
NSV:
SSH:
R:<brian.deforest@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	BB375AF679D4A34E9CA8DFA650E2B04E060D179A@onstor-exch02.onstor.net
X-Sylpheed-End-Special-Headers: 1
Date: Wed, 17 Oct 2007 11:14:41 -0700
From: Andrew Sharp <andy.sharp@onstor.com>
To: "Brian DeForest" <brian.deforest@onstor.com>
Subject: Re: Integrating changes from dev branch to other branches
Message-ID: <20071017111441.3eeaccba@ripper.onstor.net>
In-Reply-To: <BB375AF679D4A34E9CA8DFA650E2B04E060D179A@onstor-exch02.onstor.net>
References: <BB375AF679D4A34E9CA8DFA650E2B04E060D179A@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

Thanks, Brian.  As the original "Miss Manners" checkin comment
nazi, I mentioned this to Ed Kwan yesterday, only to find out he is
in London doing 20 hour days trying to get one of the UK customers
happy. I said, well, OK, you get a mulligan until you get back ~:^)

Cheers,

a


On Wed, 17 Oct 2007 09:48:49 -0700 "Brian DeForest"
<brian.deforest@onstor.com> wrote:

> Just a reminder that when you integrate changelists from the dev
> branch into other (e.g. release) branches, please cut/paste the same
> comment from the original (dev) changelist into the 2nd changelist in
> order to preserve the file history and minimize the need to lookup
> additional changelists (aka "Perforce archaeology").  
> 
> There have been a few recent integrations into the 3.1 release branch
> where the comment simply references the original changelist, something
> like:
> 
> 	Integrate changelist XXXXX into 3.1 branch
> 
> It is preferable to cut/paste the original comment from changelist
> XXXXX, such as:
> 
> 	Integrate changelist XXXXX into 3.1 branch
> 	< changelist XXXXX comment goes here >
> 
> Thanks.
> Brian
