On Mon, Aug 06, 2001 at 21:39:11 -0700, Arun Sharma wrote:
> On 7 Aug 2001 05:07:13 +0200, Daniel Eischen <[EMAIL PROTECTED]> 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.

Kenneth Merry

To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message

Reply via email to