AF:
NF:0
PS:10
SRH:1
SFN:
DSR:
MID:<20080426150431.4fe5f579@ripper.onstor.net>
CFG:
PT:0
S:andy.sharp@onstor.com
RQ:
SSV:onstor-exch02.onstor.net
NSV:
SSH:
R:<tim.gardner@onstor.com>,<danqing.jin@onstor.com>,<larry.scheer@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	BB375AF679D4A34E9CA8DFA650E2B04E04344C66@onstor-exch02.onstor.net
X-Sylpheed-End-Special-Headers: 1
Date: Sat, 26 Apr 2008 15:05:04 -0700
From: Andrew Sharp <andy.sharp@onstor.com>
To: "Tim Gardner" <tim.gardner@onstor.com>
Cc: "Danqing Jin" <danqing.jin@onstor.com>, "Larry Scheer"
 <larry.scheer@onstor.com>
Subject: Re: PERFORCE change 28985 for review
Message-ID: <20080426150504.195c0b39@ripper.onstor.net>
In-Reply-To: <BB375AF679D4A34E9CA8DFA650E2B04E04344C66@onstor-exch02.onstor.net>
References: <WEBMAILcafI0L2XFGux000005af@mail.onstor.com>
	<BB375AF679D4A34E9CA8DFA650E2B04E04344C66@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

As long as there was a common parent in both branches, it doesn't
matter which way you do the integrate.  But if there wasn't, then this
kind of integrate could wipe out the history of a file in dev, so it
should be done carefully and sparingly.

On Fri, 25 Apr 2008 21:41:43 -0700 "Tim Gardner"
<tim.gardner@onstor.com> wrote:

> Why are changes being integrated from a release branch into dev?
> Changes are supposed to be made in dev and pushed out to release
> branches.
> 
> ________________________________
> 
> From: Danqing Jin
> Sent: Fri 4/25/2008 5:20 PM
> To: Amit Bothra; Andy Sharp; Chris Vandever; Danqing Jin; Deepak
> Veliath; Eric Barrett; Henry Lau; Ian Brown; Jan Seidel; Jobi
> Ariyamannil; Jonathan Goldick; Larry Scheer; Maxim Kozlovsky; Mike
> Lee; Narain Ramadass; Sandrine Boulanger; Sripal Surendiran (HCL);
> Svati Chandra; Tim Gardner; YiFeng Liu Subject: PERFORCE change 28985
> for review
> 
> 
> 
> Change 28985 by danqingj@danqingj-dev on 2008/04/25 17:15:31
> 
>         Integrate change 28983 from R3_1_0_rel branch to dev.
>        
>         Changes for defect 23447 to close the window in
>         fs_dr_rmcInitiateFS2SSCSession() where rmc_open() succeeds
>         but fs_dr_rmcOpenYield() has not received ack for the open.
>        
>         Reviewed by: narainr
> 
> Affected files ...
> 
> ... //depot/dev/nfx-tree/code/sm-fs/fs-dump-restore-rmc.c#3 integrate
> ... //depot/dev/nfx-tree/code/sm-fs/fs-dump-restore-rmc.h#2 integrate
> ... //depot/dev/nfx-tree/code/sm-fs/fs-dump.c#18 integrate
> ... //depot/dev/nfx-tree/code/sm-fs/fs-restore.c#4 integrate
> 
> 
> http://liszt:1818/@md=d&cd=//depot/$c=G35@/28985?ac=10
> 
> 
