CODEWITHSUNDEEP
diffperforce
drastogi
drastogi

Reputation: 173

Difference between p4diff and p4diff2

What is the difference between P4 diff and P4 diff2?

Upvotes: 6

Views: 3504

Answers (1)

user100766
user100766

Reputation:

p4 diff is used on the client, e.g. to compare a locally modified file to the version on the depot. p4 diff2 is used to compare two files on the server.

From the manual:

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

Upvotes: 8

Related Questions