Date: Tue, 12 Jun 2007 17:19:37 -0700 From: John-Mark Gurney <gurney_j@resnet.uoregon.edu> To: "Bruce M. Simpson" <bms@FreeBSD.org> Cc: i386@FreeBSD.org, FreeBSD Tinderbox <tinderbox@FreeBSD.org>, current@FreeBSD.org Subject: Re: [head tinderbox] failure on i386/i386 Message-ID: <20070613001936.GT4602@funkthat.com> In-Reply-To: <466EE1E4.2090908@FreeBSD.org> References: <20070612171440.D497C73068@freebsd-current.sentex.ca> <466EE1E4.2090908@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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."
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070613001936.GT4602>