Show More
@@ -311,6 +311,7 b' txtfilters = []' | |||
|
311 | 311 | txtpats = [ |
|
312 | 312 | [ |
|
313 | 313 | ('\s$', 'trailing whitespace'), |
|
314 | ('.. note::[ \n][^\n]', 'add two newlines after note::') | |
|
314 | 315 | ], |
|
315 | 316 | [] |
|
316 | 317 | ] |
@@ -85,7 +85,9 b' ones.' | |||
|
85 | 85 | be read. Mercurial checks each of these locations in the specified |
|
86 | 86 | order until one or more configuration files are detected. |
|
87 | 87 | |
|
88 | .. note:: The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial`` | |
|
88 | .. note:: | |
|
89 | ||
|
90 | The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial`` | |
|
89 | 91 | is used when running 32-bit Python on 64-bit Windows. |
|
90 | 92 | |
|
91 | 93 | Syntax |
@@ -204,7 +206,9 b' changesets. You can define subsequent al' | |||
|
204 | 206 | |
|
205 | 207 | stable5 = latest -b stable |
|
206 | 208 | |
|
207 | .. note:: It is possible to create aliases with the same names as | |
|
209 | .. note:: | |
|
210 | ||
|
211 | It is possible to create aliases with the same names as | |
|
208 | 212 | existing commands, which will then override the original |
|
209 | 213 | definitions. This is almost always a bad idea! |
|
210 | 214 | |
@@ -235,7 +239,9 b' alias, as was done above for the purge a' | |||
|
235 | 239 | ``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg |
|
236 | 240 | echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``. |
|
237 | 241 | |
|
238 | .. note:: Some global configuration options such as ``-R`` are | |
|
242 | .. note:: | |
|
243 | ||
|
244 | Some global configuration options such as ``-R`` are | |
|
239 | 245 | processed before shell aliases and will thus not be passed to |
|
240 | 246 | aliases. |
|
241 | 247 | |
@@ -362,7 +368,9 b' filtered by the command. The string ``OU' | |||
|
362 | 368 | of an empty temporary file, where the filtered data must be written by |
|
363 | 369 | the command. |
|
364 | 370 | |
|
365 | .. note:: The tempfile mechanism is recommended for Windows systems, | |
|
371 | .. note:: | |
|
372 | ||
|
373 | The tempfile mechanism is recommended for Windows systems, | |
|
366 | 374 | where the standard shell I/O redirection operators often have |
|
367 | 375 | strange effects and may corrupt the contents of your files. |
|
368 | 376 | |
@@ -708,13 +716,17 b' variables it is passed are listed with n' | |||
|
708 | 716 | in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the |
|
709 | 717 | update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``. |
|
710 | 718 | |
|
711 | .. note:: It is generally better to use standard hooks rather than the | |
|
719 | .. note:: | |
|
720 | ||
|
721 | It is generally better to use standard hooks rather than the | |
|
712 | 722 | generic pre- and post- command hooks as they are guaranteed to be |
|
713 | 723 | called in the appropriate contexts for influencing transactions. |
|
714 | 724 | Also, hooks like "commit" will be called in all contexts that |
|
715 | 725 | generate a commit (e.g. tag) and not just the commit command. |
|
716 | 726 | |
|
717 | .. note:: Environment variables with empty values may not be passed to | |
|
727 | .. note:: | |
|
728 | ||
|
729 | Environment variables with empty values may not be passed to | |
|
718 | 730 | hooks on platforms such as Windows. As an example, ``$HG_PARENT2`` |
|
719 | 731 | will have an empty value under Unix-like platforms for non-merge |
|
720 | 732 | changesets, while it will not be available at all under Windows. |
@@ -69,6 +69,7 b' and a regexp pattern of the form ``\\.c$`' | |||
|
69 | 69 | regexp pattern, start it with ``^``. |
|
70 | 70 | |
|
71 | 71 | .. note:: |
|
72 | ||
|
72 | 73 | Patterns specified in other than ``.hgignore`` are always rooted. |
|
73 | 74 | Please see :hg:`help patterns` for details. |
|
74 | 75 |
@@ -73,6 +73,7 b' 7. If the file to be merged is not binar' | |||
|
73 | 73 | 8. The merge of the file fails and must be resolved before commit. |
|
74 | 74 | |
|
75 | 75 | .. note:: |
|
76 | ||
|
76 | 77 | After selecting a merge program, Mercurial will by default attempt |
|
77 | 78 | to merge the files using a simple merge algorithm first. Only if it doesn't |
|
78 | 79 | succeed because of conflicting changes Mercurial will actually execute the |
@@ -7,6 +7,7 b' patterns.' | |||
|
7 | 7 | Alternate pattern notations must be specified explicitly. |
|
8 | 8 | |
|
9 | 9 | .. note:: |
|
10 | ||
|
10 | 11 | Patterns specified in ``.hgignore`` are not rooted. |
|
11 | 12 | Please see :hg:`help hgignore` for details. |
|
12 | 13 |
@@ -42,6 +42,7 b' Normally, all servers are ``publishing``' | |||
|
42 | 42 | - secret changesets are neither pushed, pulled, or cloned |
|
43 | 43 | |
|
44 | 44 | .. note:: |
|
45 | ||
|
45 | 46 | Pulling a draft changeset from a publishing server does not mark it |
|
46 | 47 | as public on the server side due to the read-only nature of pull. |
|
47 | 48 | |
@@ -55,10 +56,12 b' repository to disable publishing in its ' | |||
|
55 | 56 | See :hg:`help config` for more information on configuration files. |
|
56 | 57 | |
|
57 | 58 | .. note:: |
|
59 | ||
|
58 | 60 | Servers running older versions of Mercurial are treated as |
|
59 | 61 | publishing. |
|
60 | 62 | |
|
61 | 63 | .. note:: |
|
64 | ||
|
62 | 65 | Changesets in secret phase are not exchanged with the server. This |
|
63 | 66 | applies to their content: file names, file contents, and changeset |
|
64 | 67 | metadata. For technical reasons, the identifier (e.g. d825e4025e39) |
General Comments 0
You need to be logged in to leave comments.
Login now