AF:
NF:0
PS:10
SRH:1
SFN:
DSR:
MID:<20070806121338.2bb06ac2@ripper.onstor.net>
CFG:
PT:0
S:andy.sharp@onstor.com
RQ:
SSV:onstor-exch02.onstor.net
NSV:
SSH:
R:<ken.renshaw@onstor.com>,<dl-cougar>
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	BB375AF679D4A34E9CA8DFA650E2B04E02F3D5C7@onstor-exch02.onstor.net
X-Sylpheed-End-Special-Headers: 1
Date: Mon, 6 Aug 2007 12:13:46 -0700
From: Andrew Sharp <andy.sharp@onstor.com>
To: "Ken Renshaw" <ken.renshaw@onstor.com>
Cc: <dl-cougar>
Subject: Re: dev branch missing all history
Message-ID: <20070806121346.29b3a2b6@ripper.onstor.net>
In-Reply-To: <BB375AF679D4A34E9CA8DFA650E2B04E02F3D5C7@onstor-exch02.onstor.net>
References: <20070806115825.6de1cfd9@ripper.onstor.net>
	<BB375AF679D4A34E9CA8DFA650E2B04E02F3D5C7@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

It's a requirement that the histories not be "lost" in some obsolete
branch or branches. I'm sure you remember that this is something that
Dev has been harping about for some time and I'm hard pressed to
understand why this is still happening.

This appears to only be true for files that came from the cougar
branch.  Was the cougar branch not merged/integrated into main
correctly?  Anybody know what happened?

a

On Mon, 6 Aug 2007 12:01:22 -0700 "Ken Renshaw"
<ken.renshaw@onstor.com> wrote:

> Hi Andy.
> 
> To follow file histories backwards through parent branches ( like
> main and cougar in relation to dev ), this command will do it:
> 
> -bash-3.00$ p4 filelog
> -i //depot/dev/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c //depot/dev/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c
> ... #1 change 24783 branch on 2007/07/30 by kenr@kenr-linux-depot
> (text) 'Creation of dev branch, superce' ... ... branch
> from //depot/main/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c#1 //depot/main/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c
> ... #1 change 24782 branch on 2007/07/30 by kenr@kenr-linux-depot
> (text) 'Collapse cougar branch into mai' ... ... branch
> into //depot/FB-JONG-PERF/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c#1 ... ...
> branch
> from //depot/cougar/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c#1,#3 ... ...
> branch
> into //depot/dev/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c#1 //depot/cougar/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c ...
> #3 change 24662 edit on 2007/07/20 by andys@ripper (text) 'Add scache
> support; add missing' ... ... branch
> into //depot/main/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c#1 ...
> #2 change 24490 edit on 2007/07/09 by andys@ripper (text) 'Checkpoint
> checkin of Linux ker' ... #1 change 23684 add on 2007/04/23 by
> andys@ripper (text) 'Add Linux kernel to cougar bran'
> 
> If you don't use the -i flag it only shows local branch changes. The
> command p4 fstat is useful for lots of things, but not for tracing
> archeological histories.
> 
> Thanks,
> 
> -Ken
> 
> 
> 
> -----Original Message-----
> From: Andy Sharp
> Sent: Mon 8/6/2007 11:58 AM
> To: Ken Renshaw; dl-cougar
> Subject: dev branch missing all history
>  
> I don't know how this happened, but it is a bit of a disaster.  The
> dev branch appears to have no histories?
> 
> ripper:~/src/dev/linux/kernel$ p4 fstat
> linux-mips-2.6/drivers/net/natsemi.c ...
> depotFile //depot/dev/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c ...
> clientFile /homes/andys/src/dev/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c ...
> isMapped ... headAction branch
> ... headType text
> ... headTime 1185822074
> ... headRev 1
> ... headChange 24783
> ... headModTime 1184952614
> ... haveRev 1
> 
> ripper:~/src/cougar/linux/kernel/linux-mips-2.6$ p4 fstat
> drivers/net/natsemi.c ...
> depotFile //depot/cougar/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c ...
> clientFile /homes/andys/src/cougar/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c ...
> isMapped ... headAction edit ... headType text
> ... headTime 1184971435
> ... headRev 3
> ... headChange 24662
> ... headModTime 1184952614
> ... haveRev 3
> 
