What does p4 diff do?
p4 diff runs a diff program on your workstation that compares files in your workspace to revisions in the depot. This command takes a file argument, which can contain a revision specifier. If a revision specifier is included, the file in the client workspace is diffed against the specified revision.
What is p4 shelve?
The p4 shelve command creates, modifies, or discards shelved files in a pending changelist. After shelving files, you can: revert or modify them in your client workspace. restore the shelved versions of those files to your workspace with the p4 unshelve command.
How do you add a file to a Changelist?
In general you can use: p4 reopen -c CLN FILE to move open files into the specified changelist (regardless of whether they were open for edit, add, etc.). CLN may be default to dissociate the specified files from any numbered changelist.
What is perforce Changelist?
A changelist defines a logical grouping of work across a set of files and folders. Information contained in a changelist includes the changelist identifier, a list of files, the date the changes were committed, etc.
How do you Unshelve a p4?
Unshelve files
- Right-click the file changelist and select Unshelve. P4V displays the Unshelve dialog.
- Clear the check boxes of any files that you do not want to unshelve.
- Select any other desired options.
- Click Unshelve. The shelved files are copied to your workspace and opened in the specified changelist.
How does P4 diff2 compare two different files?
Also compares two arbitrary stream specs with the -As option. p4 diff2 uses the Perforce service’s built-in diff routine to compare two file revisions from the depot. These revisions are usually two versions of the same file, but they can be revisions of entirely separate files.
What’s the difference between P4 revert and revert unchanged?
Revert all open, unchanged files. This differs from p4 revert -a (revert all unchanged files, where resolving a file, even if no changes are made, counts as a change), in that it reverts files whose workspace content matches the depot content, including resolved files that happen to be identical to those in the depot.
Can a P4 workstation run an external diff program?
If no file argument is provided, all open files are diffed against their depot counterparts. By default, your workstation runs the diff routine built into the p4 command-line application. You can make your workstation run an external diff program by setting the P4DIFF environment variable to point to your external diff program.
Why does P4 diff2 ignore the client environment variable?
p4 diff2 ignores the client environment variable P4DIFF because it runs on the Helix server. You can specify file patterns as arguments in place of specific files, with or without revision specifiers. Helix server performs diffs for each pair of files that match the given pattern.