X-MimeOLE: Produced By Microsoft Exchange V6.5
Received: by onstor-exch02.onstor.net 
	id <01C810EB.8B54D512@onstor-exch02.onstor.net>; Wed, 17 Oct 2007 10:28:42 -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: Integrating changes from dev branch to other branches
Date: Wed, 17 Oct 2007 10:28:41 -0800
Message-ID: <BB375AF679D4A34E9CA8DFA650E2B04E060D1856@onstor-exch02.onstor.net>
In-Reply-To: <20071017111441.3eeaccba@ripper.onstor.net>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: Integrating changes from dev branch to other branches
Thread-Index: AcgQ6Zah8fLynWttSd2GmCBgiHbyDwAAK36w
References: <BB375AF679D4A34E9CA8DFA650E2B04E060D179A@onstor-exch02.onstor.net> <20071017111441.3eeaccba@ripper.onstor.net>
From: "Brian DeForest" <brian.deforest@onstor.com>
To: "Andy Sharp" <andy.sharp@onstor.com>

I thought about mentioning you by name as the Perforce Police, but
decided not to.  I agree with your approach and have been dissatisified
(to put it mildly) about the Perforce archaelogy too.

-----Original Message-----
From: Andy Sharp=20
Sent: Wednesday, October 17, 2007 11:15 AM
To: Brian DeForest
Subject: Re: Integrating changes from dev branch to other branches

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