Date: Mon, 6 Aug 2001 22:54:28 -0600 From: "Kenneth D. Merry" <ken@kdm.org> To: Arun Sharma <arun@sharmas.dhs.org> Cc: current@FreeBSD.ORG Subject: Re: KSE/threads progress report Message-ID: <20010806225428.A42236@panzer.kdm.org> In-Reply-To: <20010807043911.D057F5E36E@sharmas.dhs.org>; from arun@sharmas.dhs.org on Mon, Aug 06, 2001 at 09:39:11PM -0700 References: <Pine.BSF.4.21.0108062051500.66925-100000@InterJet.elischer.org> <Pine.SUN.3.91.1010806230337.26072A@pcnet1.pcnet.com> <20010807043911.D057F5E36E@sharmas.dhs.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Aug 06, 2001 at 21:39:11 -0700, Arun Sharma wrote: > On 7 Aug 2001 05:07:13 +0200, Daniel Eischen <eischen@vigrid.com> wrote: > > > At this stage diffs must be pushing close to 1MB (maybe more) > > > (I don't know as I don't know yet how to get p4 to generate diffs :-) > > > > Isn't it just `p4 diff` ? > > The diff produced by the above command is not accepted by patch. I wrote > a script sometime back to polish the diff output. Let me know if anyone > is interested. It is accepted by patch, if you set the DIFF environment variable. Setting the P4DIFF environment variable seems to have the same effect. I set my DIFF variable to "diff -c", FWIW. According to 'p4 help diff', setting the P4DIFF environment variable causes perforce to use an external diff program. > Also, p4 diff2 has some extra options, that let you do more. diff2 output, on the other hand, won't run through patch properly. You have to run it through a fixup script to get it right. Ken -- Kenneth Merry ken@kdm.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010806225428.A42236>