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 diffUsage NotesCan File Arguments UseRevision Specifier?• The diff flags supported by p4 diff are:Can File Arguments UseRevision Range?Yes No readFlag-dn-dc-ds-du-db-dwNameMinimal Access LevelRequiredRCS output format, showing additions and deletions made to the fileand associated line ranges.context output format, showing line number ranges and three lines ofcontext around the changes.summary output format, showing only the number of chunks and linesadded, deleted, or changed.unified output format, showing added and deleted lines with sufficientcontext for compatibility with the patch(1) utility.ignore changes made within whitespaceignore whitespace altogether• The header line of a unified diff produced with the -du option for patch(1) usedisplays the diffed files in <strong>Perforce</strong> syntax, not local syntax.Examplesp4 diff foo#5p4 diff @1999/05/22p4 diff -du foop4 diff -d-brief fooCompare the client workspace revision of file footo the fifth depot revision.Compare all open files in the client workspace tothe revisions in the depot as of midnight on May22, 1999.Run the comparison on file foo, displaying outputin a format suitable for the patch(1) utility.Run the comparison on foo, passing the --briefflag to the underlying diff routine.46 <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!