PhpStorm 2017.3 Help

Apply Patch Dialog

VCS | Apply Patch


Use the dialog box to restore changes that were preserved in a patch file in the specified directory.

ItemTooltip and ShortcutDescription
Patch file name In this text box, specify the name of the *.patch file to be applied. Type the fully qualified name or click the Browse button browseButton.png and locate the desired patch file using the Select Patch File dialog box, that opens.
groupByPackage Group by Directory
Ctrl+P
Use this button to toggle between the flat view and the directory tree view. Select the checkboxes next to the changes that you want to be applied.
expandAll.png collapseAll Expand All/Collapse All
Ctrl+NumPad Plus
Ctrl+NumPad -
Use these buttons to expand/collapse all nodes
icon_vcs_basic_directory.png Map base directory In the dialog that opens, select the directory relative to which file names in the patch file will be interpreted. You can map a base directory to a single file, directory, or to a selection.
icon_showDiff.png Show Differences
Ctrl+D
Click this button to open the Differences Viewer for Files that shows the differences between your local working copy, the repository version, and the patch. Use the buttons Compare Previous File comparePreviousFile.png and Compare Next File compareNextFile.png to have the files in patch compared in a chain.

If the patch cannot be applied without conflicts, the lines with conflicts are highlighted with red.

icon_vcs_strip_directory.png Strip Directory Use this button to apply the changes to files located in different directories from the ones specified in the patch. Clicking this button removes one slash in the path to the target file. Click the button as many times as many leading directories you need to strip. The number of removed slashes is indicated in square brackets.
icon_vcs_restore_directory.png Restore Directory Use this button to revert the last strip directory action. Click the button as many times as many previously stripped leading directories you need to restore.
icon_vcs_reset_directories.png Reset Directories Use this button to revert all strip directory actions in the selection.
icon_vcs_remove_directories.png Remove Directories Click this button to have all the leading directories stripped and have the changes applied to the file with the specified name in the base directory.
refresh Refresh Click this button to synchronize the tree with the current state of the file system.
Summary This section displays summary information for the currently selected changelist (the number of modified, new, and deleted files).
Existing Changelist Select this option to add the patched files to an existing changelist and select the desired changelist from the drop-down list.
New Changelist Select this option to create a new changelist and add the patched files to it.
  • Name: in this text box, type the name of the new changelist. By default, it is the name of the current patch.
  • Comment: in in this text box, type the comment to the new changelist.
  • Make this changelist active: select this checkbox to have PhpStorm automatically give the active status to the new change list immediately after the changes are restored in it. When this checkbox is cleared, the current active changelist remains active. See Changelist for details.
  • Track Context: select this checkbox to have PhpStorm preserve the context of the task associated with the new changelist on its deactivation and restore the context when the changelist becomes active. See Managing tasks and contexts for details.
Last modified: 29 March 2018

See Also