PhpStorm 8.0.0 Web Help

VCS | Integrate Project


Use this dialog box to integrate differences between two branches in the Subversion repository into a local working copy.

Item Description
Source 1 In this text box, specify the URL address of the first branch to compare. If necessary, click the Browse button browseButton and select the desired URL from the Select Repository Location dialog box.
Source 2 In this text box, specify the URL address of the second branch to compare. If necessary, click the Browse button browseButton and select the desired URL from the Select Repository Location dialog box.
Revision For each source, specify the revision to use. The possible options are:
  • HEAD - select this option to use the Head revision of the source.

    Note

    Head revision is suggested by default

  • Specified - select this option to use a revision different from the Head revision. Specify the required revision in the text field. If necessary, click the ellypsis button and select the revision from the Changes Browser dialog box.

Tip

Based on the sources and revisions you specify, the difference between source 2 and source 1 is calculated and applied to the local working copy.

Use Ancestry Select this check box to take the ancestry of the Source1 and Source2 URLs into consideration when comparing revisions. If the check box is not selected, only the contents of the files are compared.
Try merge, but make no changes Select this check box to enable the --dry-run switch of the svn command. If this check box is not selected, the sources are merged silently.
Depth Use this drop-down list to specify the range of recursion into subdirectories. The available options are:
  • Empty - select this option to involve only the current file.
  • Files - select this option to involve the files in the folder.
  • Immediates - select this option to involve direct children of the current file.
  • Infinity - select this option to enable full recursion.

See Also

Concepts:

Procedures:

Reference:

Web Resources: