From owner-p4-projects@FreeBSD.ORG  Thu Jul 22 18:02:03 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CE78D16A4D0; Thu, 22 Jul 2004 18:02:02 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id A7FE416A4CE; Thu, 22 Jul 2004 18:02:02 +0000 (GMT)
Received: from pimout3-ext.prodigy.net (pimout3-ext.prodigy.net
	[207.115.63.102])	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 560E343D3F; Thu, 22 Jul 2004 18:02:02 +0000 (GMT)
	(envelope-from julian@elischer.org)
Received: from elischer.org (adsl-68-121-219-69.dsl.snfc21.pacbell.net
	[68.121.219.69])i6MI20lM112204;	Thu, 22 Jul 2004 14:02:01 -0400
Message-ID: <41000118.6050701@elischer.org>
Date: Thu, 22 Jul 2004 11:02:00 -0700
From: Julian Elischer <julian@elischer.org>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.4b) Gecko/20030524
X-Accept-Language: en, hu
MIME-Version: 1.0
To: Doug Rabson <dfr@freebsd.org>
References: <200407221752.i6MHqsiK009681@repoman.freebsd.org>
In-Reply-To: <200407221752.i6MHqsiK009681@repoman.freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
cc: Perforce Change Reviews <perforce@freebsd.org>
Subject: Re: PERFORCE change 57938 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jul 2004 18:02:03 -0000

Doug Rabson wrote:

>http://perforce.freebsd.org/chv.cgi?CH=57938
>
>Change 57938 by dfr@dfr_home on 2004/07/22 17:52:25
>
>	Fix IFC botch.
>
>Affected files ...
>
>.. //depot/projects/kse/sys/i386/include/asmacros.h#6 integrate
>.. //depot/projects/kse/sys/sys/kse.h#24 integrate
>
>Differences ...
>
>==== //depot/projects/kse/sys/i386/include/asmacros.h#6 (text+ko) ====
>
>@@ -44,7 +44,7 @@
>  * to a possibly-modified form that will be invisible to C programs.
>  */
> #define CNAME(csym)		csym
>-#define HIDENAME(asmsym)	__CONCAT(.,asmsym)
>+#define HIDENAME(asmsym)	.asmsym
> 
> #define ALIGN_DATA	.p2align 2	/* 4 byte alignment, zero filled */
> #ifdef GPROF
>
>==== //depot/projects/kse/sys/sys/kse.h#24 (text+ko) ====
>  
>
also, here's the perl script I use to get the diffs for the kse branch.

note it uses the label that the other script sets..

#!/usr/bin/perl

# new usage:  ./p4patch
# Usage: p4 diff2 -du  base_view  your_view

use POSIX (strftime);

$src_base = '//depot/vendor/freebsd/src';
$dst_base = '//depot/projects/kse';
$dst_label = '@kse_base';

$cmd = "p4 diff2 -du $src_base/...$dst_label $dst_base/...#head";
open(P, "$cmd |") || die $!;

$time = localtime();
$time = strftime "%a %b %e %H:%M:%S %Y", localtime;
$time = strftime "%Y/%m/%d %T", localtime;

while (<P>) {
    ($f1, $f2, $r) = m|^==== (.+) - (.+) ==== ?(.*)| or print, next;
    next if $r eq 'identical';

    ($src, $srcrev) = ($f1 =~ m|$src_base/([^#]*)#(\d+)|);
    ($dst, $dstrev) = ($f2 =~ m|$dst_base/([^#]*)#(\d+)|);
    print "Index: $dst\n";
    print '=' x 75 . "\n";

    if ($r eq '') {
        $file = "/tmp/_p4patch.$$";
        `p4 print -q $f2 > $file`;
        print `diff -Nc /dev/null $file | sed "s#$file#$dst#"`;
        `rm -f /tmp/_p4patch.$$`;
        next;
    }

    print "--- $src\t$time\t#$srcrev\n";
    print "+++ $dst\t$time\n";