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: even further patch page improvements

Changeset c98cd8c89f54…

Parent 744be3cf31ad…

by Steve Borho

Changes to one file · Browse files at c98cd8c89f54 Showing diff from parent 744be3cf31ad Diff from another changeset...

Change 1 of 2 Show Entire File doc/​source/​patches.txt Stacked
 
27
28
29
30
31
 
 
 
32
33
34
 
38
39
40
41
42
 
 
 
43
44
45
46
47
48
 
 
 
 
 
 
49
50
51
 
27
28
29
 
 
30
31
32
33
34
35
 
39
40
41
 
 
42
43
44
45
46
47
48
 
 
49
50
51
52
53
54
55
56
57
@@ -27,8 +27,9 @@
   Mercurial 1.5 improves it's behavior in this regard. It will warn you  when git diffs are required, or sometimes upgrade to the git format -automatically. -`diff section <http://www.selenic.com/mercurial/hgrc.5.html#diff>`_. +automatically. See also the +`diff section <http://www.selenic.com/mercurial/hgrc.5.html#diff>`_ of +the hgrc documentation.    Mercurial's patch routines do not deal well with mixed EOLN between  source files and patches. The **patch.eol** setting was introduced in @@ -38,14 +39,19 @@
  eol = auto #strict, lf, or crlf    The work on the hgeol extension is also improving this area. Perhaps it -will be resolved by hg-1.5. -`patch section <http://www.selenic.com/mercurial/hgrc.5.html#patch>`_. +will be resolved by hg-1.5. See also the +`patch section <http://www.selenic.com/mercurial/hgrc.5.html#patch>`_ +of the hgrc documentation.    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. Currently, these rejected changes must be -manually resolved by the user. +with an .rej extension. TortoiseHg 1.0 includes an experimental +:command:`hgtk mpatch` command that can try *harder* to apply the +rejected patch hunks. This command is based on Chris Mason's `mpatch +<http://oss.oracle.com/~mason/mpatch/>`_ utility. If mpatch cannot +apply the rejected hunks, your only remaining choice is to apply them by +hand.      Export Patches