Mercurial > hg
comparison mercurial/help/phases.txt @ 20532:f1a3ae7c15df
help: remove last occurrences of ".. note::" without two newlines
When we add two newlines after ".. note::" translators will not see this
entry. And all versions of docutils interpret this paragraph correctly
(details in de16c673455b).
author | Simon Heimberg <simohe@besonet.ch> |
---|---|
date | Wed, 19 Feb 2014 13:25:28 +0100 |
parents | b4b77909318f |
children | 311eddddca49 |
comparison
equal
deleted
inserted
replaced
20531:01a75c9d5b5e | 20532:f1a3ae7c15df |
---|---|
40 client and server | 40 client and server |
41 | 41 |
42 - secret changesets are neither pushed, pulled, or cloned | 42 - secret changesets are neither pushed, pulled, or cloned |
43 | 43 |
44 .. note:: | 44 .. note:: |
45 | |
45 Pulling a draft changeset from a publishing server does not mark it | 46 Pulling a draft changeset from a publishing server does not mark it |
46 as public on the server side due to the read-only nature of pull. | 47 as public on the server side due to the read-only nature of pull. |
47 | 48 |
48 Sometimes it may be desirable to push and pull changesets in the draft | 49 Sometimes it may be desirable to push and pull changesets in the draft |
49 phase to share unfinished work. This can be done by setting a | 50 phase to share unfinished work. This can be done by setting a |
53 publish = False | 54 publish = False |
54 | 55 |
55 See :hg:`help config` for more information on configuration files. | 56 See :hg:`help config` for more information on configuration files. |
56 | 57 |
57 .. note:: | 58 .. note:: |
59 | |
58 Servers running older versions of Mercurial are treated as | 60 Servers running older versions of Mercurial are treated as |
59 publishing. | 61 publishing. |
60 | 62 |
61 .. note:: | 63 .. note:: |
64 | |
62 Changesets in secret phase are not exchanged with the server. This | 65 Changesets in secret phase are not exchanged with the server. This |
63 applies to their content: file names, file contents, and changeset | 66 applies to their content: file names, file contents, and changeset |
64 metadata. For technical reasons, the identifier (e.g. d825e4025e39) | 67 metadata. For technical reasons, the identifier (e.g. d825e4025e39) |
65 of the secret changeset may be communicated to the server. | 68 of the secret changeset may be communicated to the server. |
66 | 69 |