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 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 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.
The 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 button and select the revision from the Changes Browser dialog box.
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.
Update Project Dialog (Subversion)
VCS | Update Project Ctrl+T Context menu of a file or directory | Subversion | Update File/Directory VCS | Subversion | Update File/Directory
Use this dialog box to update the local working copy of a file, directory, or project with a revision from the repository.
Item
Description
Update/Switch to specific Url
Select this check box to synchronize your local working copy with a specific repository. Specify the source repository either in the URL text box through its full Url address or in the Use Branch text box through the branch name.
Clear this check box to bring the changes from the repository that corresponds to the current working copy.
Use Branch
In this text box, specify the location of the required repository through its branch name. Click the Browse button to choose the required branch in the Select Branch dialog box that opens.
To use this method of specifying the required repository, you need to configure a list of branches you work with. If you have not done it yet, click Configure Branches in the Select Branch dialog box.
The text box is enabled only when the Update/Switch to specific Url check box is selected.
Url
In this text box, specify the location of the required repository through its full URL address. Click the Browse button to open the Select Repository Location dialog box.
The text box is enabled only when the Update/Switch to specific Url check box is selected.
Update/Switch to specific revision
Select this check box to synchronize your local working copy with a specific revision different from the HEAD revision. The Update/Switch to specific revision text box becomes enabled. In this text box, specify the number of the revision to be used. Click the Browse button to open the Changes Browser dialog box. By default, IntelliJ IDEA suggests to update your local working copy the HEAD revision. This option corresponds to the--non-recursive (-N) switch of the Subversion update command.
Depth
Use this drop-down list to specify the range of recursion into subdirectories. The available options are:
Working copy - select this option to get files/directories from repository subtrees that have not been checked out yet.
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.
Force Update
Select this check box to have local files replaced with the files from the repository even if the local files have modifications and thus abandon the local modifications.
Update administrative information only in changed subtrees
This option only applies to working copies older than SVN 1.7 managed by SVNKit.
During synchronization with the server (update), SVN locks your working copy one subtree after another by creating empty lockfiles in the corresponding administrative .svn directories. After that, SVN starts comparing file hashes to detect which local files need to be synchronized.
When this option is selected, SVN first checks if any files from a subtree have been modified on the server, and locks this subtree (i.e. creates a .svn/lock file) only if such files are detected. This approach improves performance but may cause concurrency issues, for example, with antiviral software.
Ignore Externals
Select this check box if you do not want IntelliJ IDEA take into account externals definitions during update.
Do not show this dialog in the future
Select this check box to have IntelliJ IDEA perform future updates silently.
To have IntelliJ IDEA show this dialog box before update again: