IntelliJ IDEA 14.0.0 Web Help

Update Directory / Update File Dialog (CVS)

VCS | CVS | Update File
VCS | CVS | Update Directory Editor | context menu of a file | CVS | Update File
Project Tool Window | context menu of a file | CVS | Update File
Project Tool Window | context menu of a selection | CVS | Update Files
Project Tool Window | context menu of a folder | CVS | Update Directory
Project Tool Window | context menu of a selection | CVS | Update Directories


In these dialog boxes, configure synchronization of local files or folders with the repository.

Item Description
Branch Merging In this area, specify the repository branch to synchronize with.
  • Don't merge - select this option to synchronize with the counterpart of the current branch in the repository. This option is selected by default.
  • Merge with branch - select this option to have the local copy synchronized with a repository branch different from the counterpart of the current branch. In the first text box below, specify the branch to synchronize with. Type the branch name manually or click the Browse button browseButton.png and select the desired branch from the list in the Select Tag dialog bos that opens.

    This option is equivalent to the -j command-line option of the update command.

  • Merge two branches - select this option to have the local copy synchronized with the result of merging two repository branches different from the counterpart of the current branch. In the text boxes below, specify the branches to synchronize with.

    This option is equivalent to the -j -j command-line option of the update command.

Use Version In this area, specify the version of repository file(s) or folder(s) to synchronize with.
  • Default - select this option to have the local copy synchronized with the latest repository version.
  • By tag - select this option to have the local copy synchronized with a particular repository version. In the text box, specify the desired version number or tag. Type the version number or tag manually or click the Browse button browseButton.png and select the desired branch from the list in the Select Revision or Tag dialog bos that opens.
    • When updating a single file, you can specify its repository counterpart either through a version number or a tag.
    • When updating an entire folder, its repository counterpart can be specified only through a tag.

    This option is equivalent to the -r command-line option of the update command.

  • By date - select this option to have the local copy synchronized with a repository version that was submitted on a particular date. Type the date manually or click the Calendar button icon_calendar.png and select the desired date from the calendar pop-up window that opens with the current date selected by default.

    This option is equivalent to the -D command-line option of the update command.

Reset sticky data Select this check box to remove the date or tag restriction from the local file(s) or folder(s) to be updated. Such restrictions are set on files and folders checked out or previously updated with the By tag or By date options.

This option is equivalent to the -A command-line option of the update command.

Prune empty directories Select this option while updating a directory to have IntelliJ IDEA remove the subfolders whose repository counterparts are empty.

This option is equivalent to the -P command-line option of the update command.

Change keyword substitution to Select this check box to have the default keyword expansion mode changed. From the drop-down list, choose the relevant substitution.

This option is equivalent to the -k command-line option of the update command.

Create new directories Select this option while updating a directory to have IntelliJ IDEA create new local subfolders when any new subfolders have been created in the repository counterpart of the directory to be updated.

This option is equivalent to the -k command-line option of the update command.

By default, all the new subfolders will be picked including empty ones. To avoid creating empty subfolders, it is recommended that you select the Prune empty directories check box as well.

Clean copy Select this check box to have IntelliJ IDEA backup the local changes and replace the changed file(s) with their counterparts from the repository.

This option is equivalent to the -C command-line option of the update command.

Do not show this dialog in the future Select this option to have the update operation performed silently in the future.

To have IntelliJ IDEA show this dialog box before update again:

  1. Open the Version Control - Confirmation page of the Settings dialog box.
  2. In the Display Option dialogs when these commands are invoked area, select the Update check box.

See Also

Last modified: 4 December 2014
comments powered by Disqus