Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable doc: start work on patches.txt

Changeset 606634f7e78f…

Parent 08b75032f01b…

by Steve Borho

Changes to one file · Browse files at 606634f7e78f Showing diff from parent 08b75032f01b Diff from another changeset...

Change 1 of 6 Show Entire File doc/​source/​patches.txt Stacked
 
25
26
27
28
 
29
30
31
 
38
39
40
 
 
 
 
 
 
 
41
42
43
 
46
47
48
49
50
51
 
 
 
52
53
54
 
58
59
60
61
62
 
 
63
64
65
66
67
68
69
70
71
 
 
 
 
72
73
74
 
79
80
81
82
 
83
84
85
86
 
 
87
88
89
90
 
 
91
92
93
 
 
94
95
96
 
130
131
132
133
 
134
135
136
 
25
26
27
 
28
29
30
31
 
38
39
40
41
42
43
44
45
46
47
48
49
50
 
53
54
55
 
 
 
56
57
58
59
60
61
 
65
66
67
 
 
68
69
70
71
72
73
 
 
 
 
 
74
75
76
77
78
79
80
 
85
86
87
 
88
89
90
 
 
91
92
93
94
 
 
95
96
97
 
 
98
99
100
101
102
 
136
137
138
 
139
140
141
142
@@ -25,7 +25,7 @@
  [diff]   git=True   -Mercurial 1.5 improves it's behavior in this regard. It will warn you +Mercurial 1.5 improves its behavior in this regard. It will warn you  when git diffs are required, or sometimes upgrade to the git format  automatically. See also the  `diff section <http://www.selenic.com/mercurial/hgrc.5.html#diff>`_ of @@ -38,6 +38,13 @@
  [patch]   eol = auto #strict, lf, or crlf   +.. note: + When eol is set to *auto*, the patching engine will preserve the line + endings of the patched file regardless of the line endings in the + patch itself. You almost always want eol to be configured to *auto*. + The only downside is that you cannot make a patch that changes the + line endings of a source file. +  The work on the hgeol extension is also improving this area. Perhaps it  will be resolved by hg-1.5. See also the  `patch section <http://www.selenic.com/mercurial/hgrc.5.html#patch>`_ @@ -46,9 +53,9 @@
 Applying a patch is not a foolproof operation. If the source file has  diverged from the file that was used to create the patch, there may be  conflicts during the patch application. These are written to a file -with an .rej extension. TortoiseHg 2.0 includes an experimental -:command:`thg rejects` command that can aid in the merging of the -rejected chunks into the source file. +with an .rej extension. TortoiseHg 2.0 includes a :command:`thg +rejects` command that can aid in the merging of the rejected chunks into +the source file.      Export Patches @@ -58,17 +65,16 @@
 ---------    To export a changeset as a patch file, use the changeset context menu of -the Repository Explorer to select :menuselection:`Export --> Export Patch`. -You will be asked to provide a filename. +the Workbench to select :menuselection:`Export --> Export Patch`. It +writes the changeset to a file in the repository root folder.    Changeset Ranges  ----------------   -Select a range of changesets in the Repository Explorer. Left click on -the first (base) changeset, then right click on the last (target) -changeset. This opens a special revision range context menu. From this -menu you can generate patches, generate a bundle, send emails, or view -the accumulated changes. +Select the start and end of a range of changesets in the Workbench and +open the special revision range context menu. From this menu you can +generate patches, generate a bundle, send emails, or visually diff the +accumulated changes.    This is a very powerful feature and there is no restriction on the base  and target changesets you can select. @@ -79,18 +85,18 @@
 .. figure:: figures/email.png   :alt: Email dialog   - Email dialog of Repository Explorer + Email dialog of Workbench    To send a changeset as an email, use the changeset context menu of the -Repository Explorer. :menuselection:`Export --> Email Patch`. This -opens the e-mail dialog for this single changeset. +Workbench. :menuselection:`Export --> Email Patch`. This opens the +e-mail dialog for this single changeset.    To send a changeset range, use the changeset range selection feature of -the Repository Explorer and select -:menuselection:`Email from here to selected...` +the Workbench and select :menuselection:`Email selected...` or +:menuselection:`Email DAG range...`.   -Lastly, you can use the :guilabel:`Email` button on the syncbar of the -Repository Explorer to email all outgoing changes to the selected remote +Lastly, you can use the :guilabel:`Email` button on the sync tab of the +Workbench to email all outgoing changes to the selected remote  repository.    .. note:: @@ -130,7 +136,7 @@
   The import dialog can be opened from the sync bar or menu of the  Repository Explorer, or via :command:`thg import`. The dialog supports -file and directory drag and drop. +file and directory drag and drop.    You have the choice of importing directly into the repository, the  working folder, or your patch queue.