From owner-freebsd-current Mon Aug 6 21:54:45 2001 Delivered-To: freebsd-current@freebsd.org Received: from panzer.kdm.org (panzer.kdm.org [216.160.178.169]) by hub.freebsd.org (Postfix) with ESMTP id 125D537B403 for ; Mon, 6 Aug 2001 21:54:42 -0700 (PDT) (envelope-from ken@panzer.kdm.org) Received: (from ken@localhost) by panzer.kdm.org (8.9.3/8.9.1) id WAA42281; Mon, 6 Aug 2001 22:54:28 -0600 (MDT) (envelope-from ken) Date: Mon, 6 Aug 2001 22:54:28 -0600 From: "Kenneth D. Merry" To: Arun Sharma Cc: current@FreeBSD.ORG Subject: Re: KSE/threads progress report Message-ID: <20010806225428.A42236@panzer.kdm.org> References: <20010807043911.D057F5E36E@sharmas.dhs.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2i In-Reply-To: <20010807043911.D057F5E36E@sharmas.dhs.org>; from arun@sharmas.dhs.org on Mon, Aug 06, 2001 at 09:39:11PM -0700 Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Mon, Aug 06, 2001 at 21:39:11 -0700, Arun Sharma wrote: > On 7 Aug 2001 05:07:13 +0200, Daniel Eischen 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