X-MimeOLE: Produced By Microsoft Exchange V6.5
Received: by onstor-exch02.onstor.net 
	id <01C7E35F.909C7066@onstor-exch02.onstor.net>; Mon, 20 Aug 2007 11:23:19 -0800
MIME-Version: 1.0
Content-Type: multipart/alternative;
	boundary="----_=_NextPart_001_01C7E35F.909C7066"
References: <20070820121722.26615413@ripper.onstor.net>
Content-class: urn:content-classes:message
Subject: RE: p4 question: command to integrate a single cl
Date: Mon, 20 Aug 2007 11:23:19 -0800
Message-ID: <BB375AF679D4A34E9CA8DFA650E2B04E02F3D668@onstor-exch02.onstor.net>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: p4 question: command to integrate a single cl
Thread-Index: AcfjXr1J7+FVdX3zRq6t5XY2uwt5YQAAA5Fe
From: "Ken Renshaw" <ken.renshaw@onstor.com>
To: "Andy Sharp" <andy.sharp@onstor.com>

This is a multi-part message in MIME format.

------_=_NextPart_001_01C7E35F.909C7066
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

I'm actually working right now on merging all the 3.0.x changes back to =
main/dev, so that particular problem is about to rectify itself :)

This is a useful operation though, I use it all the time, i.e. if you =
want to propagate a critical change to another branch or are =
constructing a patch and pulling them in onesy-twosy.

The format is:

p4 integrate -i //depot/R3_0_1_rel/...@24972,@24972 //depot/dev/...

The syntax is a little funky using the same number twice, but the =
reasoning is that:

-if you specify just one number you'll get the whole branch up to that =
point, e.g. ...@24972

-if you specify two numbers you integrate or sync the *range of =
changelists between those two, e.g. the command I listed above. Using =
the same number for both min and max range boundaries pulls in that one =
change.

Sorry if that's WTMI. As I said I'm merging that code over either today =
or tomorrow, but if you want to practice feel free to pull it over now =
:)

Thanks Andy, have a good one.

-Ken


-----Original Message-----
From: Andy Sharp
Sent: Mon 8/20/2007 12:17 PM
To: Ken Renshaw
Subject: p4 question: command to integrate a single cl
=20
Hi Ken,

What's the command to integrate a single changelist from one branch to
another?  Maybe I shouldn't do this, maybe it should be integrated to
main first and then to dev.  cl#24972 from R3_0_1_rel should go into
main/dev.

Cheers,

a


------_=_NextPart_001_01C7E35F.909C7066
Content-Type: text/html;
	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV=3D"Content-Type" CONTENT=3D"text/html; =
charset=3Diso-8859-1">
<META NAME=3D"Generator" CONTENT=3D"MS Exchange Server version =
6.5.7652.24">
<TITLE>RE: p4 question: command to integrate a single cl</TITLE>
</HEAD>
<BODY>
<!-- Converted from text/plain format -->

<P><FONT SIZE=3D2>I'm actually working right now on merging all the =
3.0.x changes back to main/dev, so that particular problem is about to =
rectify itself :)<BR>
<BR>
This is a useful operation though, I use it all the time, i.e. if you =
want to propagate a critical change to another branch or are =
constructing a patch and pulling them in onesy-twosy.<BR>
<BR>
The format is:<BR>
<BR>
p4 integrate -i //depot/R3_0_1_rel/...@24972,@24972 //depot/dev/...<BR>
<BR>
The syntax is a little funky using the same number twice, but the =
reasoning is that:<BR>
<BR>
-if you specify just one number you'll get the whole branch up to that =
point, e.g. ...@24972<BR>
<BR>
-if you specify two numbers you integrate or sync the *range of =
changelists between those two, e.g. the command I listed above. Using =
the same number for both min and max range boundaries pulls in that one =
change.<BR>
<BR>
Sorry if that's WTMI. As I said I'm merging that code over either today =
or tomorrow, but if you want to practice feel free to pull it over now =
:)<BR>
<BR>
Thanks Andy, have a good one.<BR>
<BR>
-Ken<BR>
<BR>
<BR>
-----Original Message-----<BR>
From: Andy Sharp<BR>
Sent: Mon 8/20/2007 12:17 PM<BR>
To: Ken Renshaw<BR>
Subject: p4 question: command to integrate a single cl<BR>
<BR>
Hi Ken,<BR>
<BR>
What's the command to integrate a single changelist from one branch =
to<BR>
another?&nbsp; Maybe I shouldn't do this, maybe it should be integrated =
to<BR>
main first and then to dev.&nbsp; cl#24972 from R3_0_1_rel should go =
into<BR>
main/dev.<BR>
<BR>
Cheers,<BR>
<BR>
a<BR>
<BR>
</FONT>
</P>

</BODY>
</HTML>
------_=_NextPart_001_01C7E35F.909C7066--
