Apply Patch dialog
Use the dialog to apply changes from a patch file. For more information, refer to Use patches
Item | Tooltip and Shortcut | Description |
---|---|---|
Patch file name | Specify the name of the *.patch file that you want to apply. Enter the fully qualified name or click Browse and select the patch file in the dialog that opens. | |
Show diff Control+D | Open the difference viewer that shows the differences between your local working copy, the repository version, and the patch. | |
Change Directory Paths | Choose how you want directory paths to be displayed:
| |
Refresh | Click this button to synchronize the tree with the current state of the file system. | |
Group By | Click to select how you want to group files modified in the patch. | |
Name | Select an existing changelist or type the name of a new changelist where you want the patch to be added. | |
Comment | Enter a comment to the new changelist. | |
Set active | Select this checkbox to have DataSpell automatically give the active status to the new changelist immediately after the changes are restored in it. When this checkbox is cleared, the current active changelist remains active. | |
Track context | Select this checkbox to have DataSpell preserve the context of the task associated with the new changelist on its deactivation and restore the context when the changelist becomes active. | |
Analyze and apply patch from clipboard on the fly | Select this option if you want DataSpell to automatically detect patches in clipboard contents and suggest applying them. | |
Import to Shelf | Click this button to move the patch contents to a shelf instead of applying it. A new changelist will the patch file be added to the Shelf tab of the Commit tool window Alt+0. You can review the changes and unshelve them when needed. |
If the patch cannot be applied without conflicts, conflicting lines are highlighted in red.