AF:
NF:0
PS:10
SRH:1
SFN:
DSR:
MID:<20070820153346.15a75353@ripper.onstor.net>
CFG:
PT:0
S:andy.sharp@onstor.com
RQ:
SSV:onstor-exch02.onstor.net
NSV:
SSH:
R:<ken.renshaw@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	BB375AF679D4A34E9CA8DFA650E2B04E02F3D668@onstor-exch02.onstor.net
X-Sylpheed-End-Special-Headers: 1
Date: Mon, 20 Aug 2007 15:34:01 -0700
From: Andrew Sharp <andy.sharp@onstor.com>
To: "Ken Renshaw" <ken.renshaw@onstor.com>
Subject: Re: p4 question: command to integrate a single cl
Message-ID: <20070820153401.1a420222@ripper.onstor.net>
In-Reply-To: <BB375AF679D4A34E9CA8DFA650E2B04E02F3D668@onstor-exch02.onstor.net>
References: <20070820121722.26615413@ripper.onstor.net>
	<BB375AF679D4A34E9CA8DFA650E2B04E02F3D668@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

On Mon, 20 Aug 2007 12:23:19 -0700 "Ken Renshaw"
<ken.renshaw@onstor.com> wrote:

> 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 :)

No, that's all good info.  I'll let you do it the official way, it's
much too likely that I'll screw it up.

Cheers,

a

> 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
>  
> 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
> 
