When you choose Integrate... from the pulldown menu on the Files tab with a file selected, you can use the resulting Integrate page to set up an integration to or from the current file. In most cases, you only need to be concerned with these fields on the Integrate page:
Current file:
This is filled in for you. It is a writable field to give you more flexibility, but you don't have to change it.Direction to integrate changes:
Select the direction in which you want integrate:
- To current file is the default. The current file will be the integration target -- that is, it will be opened for integrate. Changes in the source file will be integrated to the current file.
- From current file means the current file will be the integration source and will not be opened for integrate. Changes in the current file will be integrated to the target file.
Integrate with this file:
Enter a complete filename, including its depot path, here. This tells Perforce which file to use as the corresponding source or target, depending on the integration direction you chose.
The "Integrate" button runs the integrate command and opens the file for integrate according to the options you chose.
You can use the "Preview Integration" button to see how the file would be opened. This is a particularly good idea when you are using integrate to rename a file -- it lets you confirm that you are creating a file with the correct name and path. To actually run the integrate command after previewing it, click your browser's "Back" button to return to the Integrate Options page, then click "Integrate".
An alternative to specifying a corresponding file is to use a branch spec. A branch spec is a predefined, stored mapping of corresponding paths.
Use branch spec:
If there is a branch spec that you want to use for this integration, click this radio button and enter the name of the branch spec. When you choose this option, any "corresponding file" you entered above will be ignored. The branch spec will be used to determine the corresponding file for this integration.
The remaining advanced options are the same regardless of how you arrived at the Integrate page.