integfb.html #1

<TITLE>Integrating a File via a File</TITLE>

<p> When you choose <b>Integrate...</b> from the <b>Action</b> menu on the <B>Files</B> 
  tab with a file selected, you can use the resulting <a href="integrate?help">Integrate</a> 
  page to set up an integration to or from the current file. In most cases, you 
  only need to be concerned with the following fields on the <b>Integrate</b> 
  page: 
<blockquote>

<p><b>Current file:
</b>
This is filled in for you.
It is a writable field to give you more flexibility,
but you don't have to change it.

  <p><b>Direction to integrate changes: </b> Select the direction in which you 
    want integrate. Options are: 
  <ul>
    
    <li><b>To current file</b> is the default. The current file is the 
      integration <i>target</i>&#151;that is, it will be opened for integrate. 
      Changes in the source file will be integrated to the current file. 
      <p> 
      <p>
    <li><b>From current file</b> means the current file is the integration 
      <i>source</i> and will not be opened for integrate. Changes in the current 
      file will be integrated to the target file. 
  </ul>

<p><b>Integrate with this file:
</b> 
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.

</blockquote>

<p>
The "Integrate" button runs the <b>integrate</b> command and
opens the file for integrate according to the options
you chose.
<p> You can use the "Preview Integration" button to see how the file <i>would</i> 
  be opened. This is a particularly good idea when you are using <b>integrate</b> 
  to rename a file, because it lets you confirm that you are creating a file with 
  the correct name and path. To actually run the <b>integrate</b> command after 
  previewing it, click your browser's "Back" button to return to the <b>Integrate 
  Options</b> page, then click "Integrate". 
<hr>
<h4>Advanced options</h4>

<p>
An alternative to specifying a corresponding file
is to use a <a href="branch?help">branch spec</a>.
A branch spec is a predefined, stored mapping of corresponding paths.

<blockquote>

<p><b>Use branch spec:
</b>
    To use a branch spec 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 is ignored. Instead, the branch spec determines the 
    corresponding file for this integration. 
</blockquote>

<p>
The remaining advanced options are the same regardless of how you arrived at
the <a href="integrate?help">Integrate</a> page.