diff - p4diff と p4diff2 の違い

Question

P4 diff と P4 diff2 の違いは何ですか?

Answer 1

p4 diffたとえば、ローカルで変更されたファイルをデポのバージョンと比較するために使用されます。サーバー上のp4 diff22 つのファイルを比較するために使用されます。

マニュアルから：

$ p4 help diff

On the client machine, diff a client file against the corresponding
revision in the depot. The file is compared only if the file is
opened for edit or a revision is provided. See 'p4 help revisions'
for details about specifying revisions.

$ p4 help diff2

'p4 diff2' runs on the server to compare one set of depot files (the
'source') to another (the 'target').  Source and target file sets
can be specified on the 'p4 diff2' command line or through a branch
view.