When you choose Integrate... from the Action menu on the Files tab with a folder selected, you can use the resulting Integrate page to set up an integration to or from all the files in the selected path. In most cases, you only need to be concerned with the following fields on the Integrate page:
Current path: This is initialized for you. If you change it, terminate the pathname with a slash ("/").
Direction to integrate changes: Select the direction in which you want integrate:
- To files in current path is the default. Files in the current path are integration targets—that is, they are the ones that will be opened for integrate. Changes in the source files will be integrated to files in the current path.
- From files in current path means the files in the current path will be the integration source and will not themselves be opened for integrate. Changes to files in the current path will be integrated to the target files.
Use corresponding path: Enter a pathname here. Make sure the pathname ends with a slash ("/"). This tells Perforce what pathname to use when looking for corresponding source or target files, depending on the integration direction you chose.
The "Integrate" button runs the integrate command and opens files for integrate according to the options you choose.
You can use the "Preview Integration" button to see which files would be opened. This is a particularly good idea when you are using integrate to branch new files, to confirm that you are creating files in the correct 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 corresponding paths each time you integrate is to use a branch spec. A branch spec is a predefined mapping of corresponding paths. To list branch specs, choose Go To>Branch List.
Use branch spec: Click this radio button and enter the name of the branch spec. When you choose this option, any "corresponding path" you entered above is ignored.
- Integrate files in current path: Restricts the integration to the files in the current path, using the branch spec. Whether the files in the current path are the source or target files is controlled by the "direction to integrate" option, above.
- Integrate all files in branch spec: If you chose this option, the current path is ignored, and all the files in the branch spec are considered for integration. You must choose whether to integrate in the forward or reverse direction of the branch spec:
- forward: the files on the right-hand side of the branch spec mapping are the targets and will be opened for integrate. The files on the left-hand side of the branch spec mapping are the source. (default.)
- reverse: the files on the left-hand side of the branch spec mapping are the targets and will be opened for integrate. The files on the right-hand side of the branch spec mapping are the source.
The remaining advanced options are the same regardless of how you arrived at the Integrate page.