Previous Table of Contents Index Next
Perforce 2012.1: Command Reference



p4 reconcile
Synopsis
Open files for add, delete, and/or edit in order to reconcile a workspace with changes made outside of Perforce.
Syntax
p4 [g-opts] reconcile [-c changelist] [-e -a -d -f -I -l -n] [file ...]
Description
The p4 reconcile command finds unopened files in a client's workspace and detects the following three types of inconsistencies between your workspace and the server:
1.
Files present in the depot, present in your have list, but missing from your workspace. By default, these files are then opened for delete.
2.
3.
To limit the scope of p4 reconcile to add, edit, or delete, use the -a, -e, or -d flags.
To preview the set of proposed workspace reconciliation actions, use the -n flag.
By default, p4 reconcile does not check files and/or paths mentioned in the P4IGNORE file. Use the -I flag to override this behavior and ignore the P4IGNORE file.
Options
Delete files: Find files missing from the client workspace, but present on the server; open these files for delete, but only if these files are in the user's have list.
Add filenames that contain special (wildcard) characters. Files containing the special characters @, #, %, or * are reformatted to encode the characters using hex notation. After these files are added, you must refer to them using their reformatted filenames.
Usage Notes
Can File Arguments Use
Revision Specifier?
The p4 reconcile command produces output in depot syntax. To see file names and paths in local syntax, you must either use the -l flag with p4 reconcile, or use p4 status.
When called without arguments, p4 reconcile opens the files in a changelist. To preview an operation, you must either use the -n flag with p4 reconcile, or use the p4 status command.
Related Commands
A shortcut for p4 reconcile -n
A shortcut for p4 reconcile -ead
 


Previous Table of Contents Index Next

Perforce 2012.1: Command Reference
Copyright 1999-2012 Perforce Software.