Reconcile offline work

P4V enables you to continue making changes to files even when disconnected from the P4 Server. This functionality is particularly useful when working in environments with intermittent or no network connectivity.

While offline, you can:

• Modify files that were previously checked out.

• Manually make files writable in order to edit, add, or delete them if they were not checked out beforehand.

Changes made offline are not automatically tracked by the P4 Server and must be reconciled once the connection is restored.

After reconnecting to the P4 Server, when you right-click the target folder on the Workspace tab in the tree pane and select Reconcile Offline Work, P4V compares your workspace to the depot to identify discrepancies, including:

• Locally modified files not checked out.

• New files in the workspace that are not in the depot.

• Files deleted locally that still exist in the depot.

The reconcile process helps align your local changes with the P4 Server by allowing you to selectively add, edit, or delete files from changelists.

To update the P4 Server depot with the work you did offline:

1. In the P4V tree pane, on the Workspace tab, right-click the folder that contains the files that you have edited, added, or deleted, and click Reconcile Offline Work. The Reconcile Offline Work dialog appears.

   

   In the Reconcile Offline Work dialog:

   • Select the changelist that you want to add your changes to.

   • Select Detect moved files when reconciling offline work to identify moved files during reconciliation.

   • Select Apply P4IGNORE files for this workspace to exclude the files or folders in the p4ignore.txt file.

   To set the default values for Detect moved files when reconciling offline work and Apply P4IGNORE files for this workspace options, see Behavior preferences.

   Click either of the following buttons:

   • Reconcile to immediately begin the reconciliation process.

   • Preview to see an estimation of the expected result of the reconcile. The Reconcile Offline Work Progress dialog box shows reconciliation progress.

     

     Once the estimation for the reconcile process is complete, the Reconcile Offline Work dialog box appears.

     

2. In the Reconcile Offline Work dialog box, specify the reconciliation options:

   1. (Optional) Use the filter pane to limit the list of displayed files:

      In the Match list, specify filter criteria:

      • All retrieves results that meet all of the conditions you enter. This option is equivalent to the logical operator "and." Use All to construct more restrictive searches. For example, if you want to retrieve only the jobs that contain both the term "installation" and the term "administration," use All.

      • Any retrieves results that meet any of the conditions you enter. This option is equivalent to the logical operator "or." Use Any to construct less restrictive searches. For example, if you want to retrieve the jobs that contain at least one of the terms "installation" or "administration," use Any.

      Use the following buttons to add or delete filter rows:

      • To add conditions, click the plus button .
      • To remove conditions, click the minus button .

   2. Select the files that you want to:

      • Check out so that you can submit your changes.
      • Mark for add.
      • Mark for delete from the depot.

      For renamed files, you must add a file with a new name to the depot and then delete the original file from the depot. If you altered the directory structure of your workspace, you might have to adjust your workspace view. For more information, see Rename and move files or folders and Define a workspace view.

   3. Select the changelist that you want to add your changes to.
3. Click Reconcile to add your selected changes to the changelist. The Reconcile Offline Work Progress window shows the progress of reconciliation.
4. Submit the changelist.