[head tinderbox] failure on i386/i386
gurney_j at resnet.uoregon.edu
Wed Jun 13 00:19:39 UTC 2007
Bruce M. Simpson wrote this message on Tue, Jun 12, 2007 at 19:11 +0100:
> I love p4 diff2, not. The userland files were of course missing. I am
> about to commit them now.
> It seems 'p4 diff2 -u' is not a panacea and one still needs to grep the
> output without -u to see files which are on one branch but not the other.
You have looked at the makediff.pl script that's been making it's rounds
right? Like at freefall:~gnn/makediff.pl
This generates a complete patch compatible diff via diff2 w/ the necessary
new files, etc..
John-Mark Gurney Voice: +1 415 225 5579
"All that I will do, has been done, All that I have, has not."
More information about the freebsd-current