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.	Files present in your workspace, but missing on the depot. By default, these files are opened for add.

3.	Files modified in your workspace that are not open for edit. By default, these files are opened for edit.

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

-c changelist	Open the files in the specified pending changelist.
-e	Edit files: Find files in the client workspace that have been modified outside of Perforce, and open them for edit.
-a	Add files: Find files in the client workspace that are not under Perforce control and open them for add.
-d	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.
-n	Preview the results of the operation without performing any action.
-f	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.
-I	Do not perform any ignore checking; ignore any settings specified by P4IGNORE.
-l	Display output in local file syntax with relative paths, similar to the workspace-centric view of p4 status.
g-opts	See the Global Options section.

Usage Notes

Can File Arguments Use Revision Specifier?	Can File Arguments Use Revision Range?	Minimal Access Level Required
No	No	open

•	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	p4 status
A shortcut for p4 reconcile -ead	p4 status -A