Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

stable doc: add more detail to the patch page

Changeset 6b058a245c5e…

Parent 08da58447a29…

by Steve Borho

Changes to one file · Browse files at 6b058a245c5e Showing diff from parent 08da58447a29 Diff from another changeset...

Change 1 of 1 Show Entire File doc/​source/​patches.txt Stacked
 
108
109
110
111
112
 
 
113
114
115
116
117
118
119
120
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
121
122
123
124
125
126
 
 
 
 
 
 
 
 
 
 
127
128
 
108
109
110
 
 
111
112
113
114
115
116
117
 
 
 
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
 
140
141
142
143
144
145
146
147
148
149
150
151
@@ -108,21 +108,44 @@
 highlighted (mouse selected, not toggled) hunks to the clipboard.    .. note:: - Reversing the order of your selection reverses the effect of the - patch. + Reversing the order of your changeset selection reverses the effect + of the patch.      Import Patches  ==============   -Import dialog -Pitfall: requires clean working directory state -Pitfall: hg import can spawn an editor if patch has no header +.. figure:: figures/import.png + :alt: Import tool + + Import dialog of Repository Explorer + +The import dialog can be opened from the sync bar or menu of the +Repository Explorer, or via :command:`hgtk import`. The dialog supports +file and directory drag and drop. The drop down menu in the upper right +corner next to the :guilabel:`Browse` button has the options: +:guilabel:`Browse Directory..` and :guilabel:`Import from Clipboard`. + +.. warning:: + Pitfall: importing a patch requires a clean working directory state + Pitfall: if the patch you are importing does not have a commit + message, Mercurial will try to launch your editor, just as if you + had tried to import the patch from the command line. Your ui.editor + needs to be a GUI app to make this work correctly.      Patch Queues  ============   -MQ pane in Repository Explorer, Commit tool. +.. figure:: figures/patchqueue.png + :alt: Patch Queue + + Patch Queue panel in the Repository Explorer + +Both the Repository Explorer and Commit Tool have optional Patch Queue +panels that are available when the user has enabled the MQ extension. +It allows the user to perform most possible patch operations including +push, pop, rename, and finish. It's recommended that you learn the MQ +extension before using the Patch Queue panel.    .. vim: noet ts=4