X-MimeOLE: Produced By Microsoft Exchange V6.5
Received: by onstor-exch02.onstor.net 
	id <01C7D85E.DF61CE2E@onstor-exch02.onstor.net>; Mon, 6 Aug 2007 11:20:38 -0800
MIME-Version: 1.0
Content-Type: multipart/alternative;
	boundary="----_=_NextPart_001_01C7D85E.DF61CE2E"
References: <20070806115825.6de1cfd9@ripper.onstor.net><BB375AF679D4A34E9CA8DFA650E2B04E02F3D5C7@onstor-exch02.onstor.net> <20070806121346.29b3a2b6@ripper.onstor.net>
Content-class: urn:content-classes:message
Subject: RE: dev branch missing all history
Date: Mon, 6 Aug 2007 11:20:38 -0800
Message-ID: <BB375AF679D4A34E9CA8DFA650E2B04E02F3D5CA@onstor-exch02.onstor.net>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: dev branch missing all history
Thread-Index: AcfYXel9oLCGAx0aRoW+kXkZCQYdnwAACNvK
From: "Ken Renshaw" <ken.renshaw@onstor.com>
To: "Andy Sharp" <andy.sharp@onstor.com>
Cc: <dl-cougar>

This is a multi-part message in MIME format.

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

Nothing is 'lost' Andy so there's nothing to harp about. Creating a new =
branch obviously starts over at revision #1 for a given file, plain and =
simple. In the 2 meetings we had we all talked about the fact that in =
going to a new single branch the local histories would be reset for the =
reason just stated, and would be less important over time.

The merge was done correctly Andy, no data is lost, and I cannot see why =
p4 filelog -i is not a perfectly acceptable solution here.


-----Original Message-----
From: Andy Sharp
Sent: Mon 8/6/2007 12:13 PM
To: Ken Renshaw
Cc: dl-cougar
Subject: Re: dev branch missing all history
=20
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.
>=20
> To follow file histories backwards through parent branches ( like
> main and cougar in relation to dev ), this command will do it:
>=20
> -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'
>=20
> 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.
>=20
> Thanks,
>=20
> -Ken
>=20
>=20
>=20
> -----Original Message-----
> From: Andy Sharp
> Sent: Mon 8/6/2007 11:58 AM
> To: Ken Renshaw; dl-cougar
> Subject: dev branch missing all history
> =20
> I don't know how this happened, but it is a bit of a disaster.  The
> dev branch appears to have no histories?
>=20
> 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
>=20
> 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
>=20


------_=_NextPart_001_01C7D85E.DF61CE2E
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: dev branch missing all history</TITLE>
</HEAD>
<BODY>
<!-- Converted from text/plain format -->

<P><FONT SIZE=3D2>Nothing is 'lost' Andy so there's nothing to harp =
about. Creating a new branch obviously starts over at revision #1 for a =
given file, plain and simple. In the 2 meetings we had we all talked =
about the fact that in going to a new single branch the local histories =
would be reset for the reason just stated, and would be less important =
over time.<BR>
<BR>
The merge was done correctly Andy, no data is lost, and I cannot see why =
p4 filelog -i is not a perfectly acceptable solution here.<BR>
<BR>
<BR>
-----Original Message-----<BR>
From: Andy Sharp<BR>
Sent: Mon 8/6/2007 12:13 PM<BR>
To: Ken Renshaw<BR>
Cc: dl-cougar<BR>
Subject: Re: dev branch missing all history<BR>
<BR>
It's a requirement that the histories not be &quot;lost&quot; in some =
obsolete<BR>
branch or branches. I'm sure you remember that this is something =
that<BR>
Dev has been harping about for some time and I'm hard pressed to<BR>
understand why this is still happening.<BR>
<BR>
This appears to only be true for files that came from the cougar<BR>
branch.&nbsp; Was the cougar branch not merged/integrated into main<BR>
correctly?&nbsp; Anybody know what happened?<BR>
<BR>
a<BR>
<BR>
On Mon, 6 Aug 2007 12:01:22 -0700 &quot;Ken Renshaw&quot;<BR>
&lt;ken.renshaw@onstor.com&gt; wrote:<BR>
<BR>
&gt; Hi Andy.<BR>
&gt;<BR>
&gt; To follow file histories backwards through parent branches ( =
like<BR>
&gt; main and cougar in relation to dev ), this command will do it:<BR>
&gt;<BR>
&gt; -bash-3.00$ p4 filelog<BR>
&gt; -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<BR>
&gt; ... #1 change 24783 branch on 2007/07/30 by =
kenr@kenr-linux-depot<BR>
&gt; (text) 'Creation of dev branch, superce' ... ... branch<BR>
&gt; 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<BR>
&gt; ... #1 change 24782 branch on 2007/07/30 by =
kenr@kenr-linux-depot<BR>
&gt; (text) 'Collapse cougar branch into mai' ... ... branch<BR>
&gt; into =
//depot/FB-JONG-PERF/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c#1 =
... ...<BR>
&gt; branch<BR>
&gt; from =
//depot/cougar/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c#1,#3 =
... ...<BR>
&gt; branch<BR>
&gt; 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 ...<BR>
&gt; #3 change 24662 edit on 2007/07/20 by andys@ripper (text) 'Add =
scache<BR>
&gt; support; add missing' ... ... branch<BR>
&gt; into =
//depot/main/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c#1 ...<BR>
&gt; #2 change 24490 edit on 2007/07/09 by andys@ripper (text) =
'Checkpoint<BR>
&gt; checkin of Linux ker' ... #1 change 23684 add on 2007/04/23 by<BR>
&gt; andys@ripper (text) 'Add Linux kernel to cougar bran'<BR>
&gt;<BR>
&gt; If you don't use the -i flag it only shows local branch changes. =
The<BR>
&gt; command p4 fstat is useful for lots of things, but not for =
tracing<BR>
&gt; archeological histories.<BR>
&gt;<BR>
&gt; Thanks,<BR>
&gt;<BR>
&gt; -Ken<BR>
&gt;<BR>
&gt;<BR>
&gt;<BR>
&gt; -----Original Message-----<BR>
&gt; From: Andy Sharp<BR>
&gt; Sent: Mon 8/6/2007 11:58 AM<BR>
&gt; To: Ken Renshaw; dl-cougar<BR>
&gt; Subject: dev branch missing all history<BR>
&gt;&nbsp;<BR>
&gt; I don't know how this happened, but it is a bit of a =
disaster.&nbsp; The<BR>
&gt; dev branch appears to have no histories?<BR>
&gt;<BR>
&gt; ripper:~/src/dev/linux/kernel$ p4 fstat<BR>
&gt; linux-mips-2.6/drivers/net/natsemi.c ...<BR>
&gt; depotFile =
//depot/dev/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c ...<BR>
&gt; clientFile =
/homes/andys/src/dev/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c =
...<BR>
&gt; isMapped ... headAction branch<BR>
&gt; ... headType text<BR>
&gt; ... headTime 1185822074<BR>
&gt; ... headRev 1<BR>
&gt; ... headChange 24783<BR>
&gt; ... headModTime 1184952614<BR>
&gt; ... haveRev 1<BR>
&gt;<BR>
&gt; ripper:~/src/cougar/linux/kernel/linux-mips-2.6$ p4 fstat<BR>
&gt; drivers/net/natsemi.c ...<BR>
&gt; depotFile =
//depot/cougar/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c ...<BR>
&gt; clientFile =
/homes/andys/src/cougar/linux/kernel/linux-mips-2.6/drivers/net/natsemi.c=
 ...<BR>
&gt; isMapped ... headAction edit ... headType text<BR>
&gt; ... headTime 1184971435<BR>
&gt; ... headRev 3<BR>
&gt; ... headChange 24662<BR>
&gt; ... headModTime 1184952614<BR>
&gt; ... haveRev 3<BR>
&gt;<BR>
<BR>
</FONT>
</P>

</BODY>
</HTML>
------_=_NextPart_001_01C7D85E.DF61CE2E--
