p4diff与p4diff2的区别

Question

P4 diff和P4 diff2之间的区别是什么？

Answer 1

在客户端上使用p4 diff，例如将本地修改的文件与仓库上的版本进行比较。p4 diff2用于比较服务器上的两个文件。

从手册中：

$ 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.