11.07.2015 Views

Perforce 2003.1 Command Reference

Perforce 2003.1 Command Reference

Perforce 2003.1 Command Reference

SHOW MORE
SHOW LESS

You also want an ePaper? Increase the reach of your titles

YUMPU automatically turns print PDFs into web optimized ePapers that Google loves.

p4 diff2• When p4 diff2 is used to diff binary files, the line... files differ ...is printed if they are not identical.• The option -b branch [ [fromfile[rev]] tofile[rev] ] may seem incorrect atfirst. Since the branch specification maps fromfiles to tofiles, why would youspecify both fromfile and tofile file patterns? You wouldn’t, but this syntax allowsyou to specify a fromfile file pattern and a tofile revision, or a fromfile revisionand a tofile file pattern.Examplesp4 diff2 -ds foo#1 foop4 diff2foo@34 foo@1998/12/04p4 diff2//depot/bar/... //depot/bar2/...#4p4 diff2//depot/bar/* //depot/bar2/...p4 diff2-b foo //depot/bar/...#2 @50Compare the second revision of file foo toits head revision, and display a summaryof what chunks were added to, deletedfrom, or changed within the file.Diff the revision of foo that was in thedepot after changelist 34 was submittedagainst the revision in the depot atmidnight on December 4, 1998.Compare the head revisions of all filesunder //depot/bar to the fourth revisionof all files under //depot/bar2Not allowed. The wildcards in each filepattern need to match.Compare the second revision of the files in//depot/bar/... to the files branchedfrom it by branch specification foo at therevision they were at in changelist 50.Related <strong>Command</strong>sTo compare a client workspace file to a depot file revisionTo view the entire contents of a filep4 diffp4 print50 <strong>Perforce</strong> <strong>2003.1</strong> <strong>Command</strong> <strong>Reference</strong>

Hooray! Your file is uploaded and ready to be published.

Saved successfully!

Ooh no, something went wrong!