Resubmit

If there are file conflicts between the personal and remote servers when performing a fetch, those conflicts enter a resolve/resubmit cycle. In the cycle, one or more conflicting files from the remote and personal server are resolved. Then the resolved files are resubmitted.

There is one resubmit for each affected changelist that is affected by the fetch.

The resolve/resubmit cycle is automated and can be completed without user interaction, but if a file conflict exists, each cycle requires user interaction.

The Resubmit dialog box opens if the fetch has conflicts. At the top is a list of all affected changelists, along with their resubmit status. Below that list is the current changelist that is being resolved.

You can interrupt the resolve/resubmit cycle at any time by clicking Finish Later. It is highly recommended that you complete the cycle before performing any actions to affected files to minimize potential data loss. After a restart, P4V reopens the Resubmit dialog box.

If a file needs to be resolved before it is resubmitted, the Resubmit dialog box provides an option to resolve the file conflict. The P4V Resolve dialog box loads prepopulated with the files associated in the current step of the resolve/resubmit cycle.

When the fetch brings down files from the remote server, all local files in conflict are moved to a tangent depot residing on the local server. The tangent depot is a system-generated, read-only location in which files with conflicting changes are stored. Files are automatically moved to the tangent depot as part of the Fetch process. For more information on the various kinds of depots, including the tangent depot, see the p4 depot chapter in the P4 CLI Reference.

For each changelist with conflicts, a new changelist containing changes from the remote server replaces the old changelist that has been moved to the tangent depot. The source for the resolve refers to the local files in the tangent depot. The target for the resolve refers to the remote files that have been moved to the local depot itself.

For example, in P4 Merge, the source is the local file (say MyFile.c#7), the target is the remote file with conflicts (with no stated revision), and the base is the common previous revision (say MyFile.c#6).

If there is any confusion, run P4 Merge from the Resolve dialog box (by selecting the Merge Tool option) to clarify the source and target of the resolve.

To learn more, see p4 resubmit in the P4 CLI Reference or run the p4 help resubmit command from the command line.