PERFORCE change 57938 for review
Julian Elischer
julian at elischer.org
Thu Jul 22 11:02:03 PDT 2004
Doug Rabson wrote:
>http://perforce.freebsd.org/chv.cgi?CH=57938
>
>Change 57938 by dfr at 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";
More information about the p4-projects
mailing list