X-MimeOLE: Produced By Microsoft Exchange V6.5
Received: by onstor-exch02.onstor.net 
	id <01C810FF.4D9C6368@onstor-exch02.onstor.net>; Wed, 17 Oct 2007 12:50:08 -0800
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Content-class: urn:content-classes:message
Subject: FW: cougar prom code
Date: Wed, 17 Oct 2007 12:50:08 -0800
Message-ID: <BB375AF679D4A34E9CA8DFA650E2B04E060D194C@onstor-exch02.onstor.net>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: cougar prom code
Thread-Index: AcgQJ1RRE9G71yI3R0+ou2EYOXZtBAAAHahnAAAOVhAAL+xlTgABkEagAACNxPYAA8YiIA==
From: "Tim Gardner" <tim.gardner@onstor.com>
To: "dl-Cougar" <dl-Cougar@onstor.com>



-----Original Message-----
From: Ken Renshaw=20
Sent: Wednesday, October 17, 2007 12:02 PM
To: Tim Gardner
Subject: RE: cougar prom code

The branch has been grafted onto dev branch, and last od the old PROM
branches is locked.

-Ken


-----Original Message-----
From: Tim Gardner
Sent: Wed 10/17/2007 11:47 AM
To: Ken Renshaw
Subject: RE: cougar prom code
=20
Ken,

I looked at the files. Please just use the one that is already in the
prom/cg directory. Thanks.

Tim

-----Original Message-----
From: Ken Renshaw=20
Sent: Wednesday, October 17, 2007 11:01 AM
To: Tim Gardner
Subject: RE: cougar prom code

Hey Tim, this is finished and ready to submit except for the seep.h file
which has 6 conflicts. Should I just accept the version you already had
in the tree or do you want to log in and resolve the commit?

If so:

ssh root@10.0.0.144 ( password )
su - kenr
cd /perforce/trees/dev/prom/cg
p4 resolve

You can set $DISPLAY and use p4v or tkdiff or something if you'd like as
well.

Thanks,

-Ken


-----Original Message-----
From: Tim Gardner
Sent: Tue 10/16/2007 12:09 PM
To: Ken Renshaw
Subject: RE: cougar prom code
=20
Yes please.

-----Original Message-----
From: Ken Renshaw=20
Sent: Tuesday, October 16, 2007 12:07 PM
To: Tim Gardner
Subject: Re: cougar prom code

You bet Tim, should I lock the source branch afterwards as well?

-Ken

=20

-----Original Message-----
From: Tim Gardner
To: Ken Renshaw
Sent: Tue Oct 16 12:04:08 2007
Subject: cougar prom code

Ken,

Rick Lund has checked in all the cougar code into //depot/diag_cg.
Can you please move this to the //depot/dev/prom/cg directory. Thanks.

Tim


