Geek Answers Handbook

Perforate the visual diff of a forked file (p4 diff2 with an external difference)

I would like to see a visual diff of a forked file. Therefore i do it

p4 diff2 -b branchname main.cpp

One problem ... it is not visual and external diff is not supported. http://www.perforce.com/perforce/doc.current/manuals/cmdref/diff2.html

p4 diff2 does not use the diff program specified by the environment variable P4DIFF.
The diff algorithm used by p4 diff2 runs on the machine hosting the Perforce server,
and always uses the server built-in diff routine.

I need my visual diff. How to get it?

+5
source share
4 answers

Maybe the easiest way is to make diff from P4V?

, p4 print , diff ?

+5

Kdiff3 , .

( P4Win):

  • → → . . → Kdiff3 → [ ]
  • → → → → Kdiff3 → Compare With → [first file]

-!

, . , Windows, , Kdiff3 .

0

. Perforce blog p4v .
diffdialog , , , , - .

0

p4 diff.

http://www.perforce.com/perforce/doc.021/manuals/cmdref/diff2.html:
"p4 diff2 diff, P4DIFF. diff, p4 diff2, , Perforce, diff."

0

More articles:


All Articles