Show More
@@ -61,8 +61,8 b' To use, configure notify extension and e' | |||||
61 |
|
61 | |||
62 | glob patterns are matched against path to repository root. |
|
62 | glob patterns are matched against path to repository root. | |
63 |
|
63 | |||
64 |
if you like, you can put notify config file in repository that users |
|
64 | if you like, you can put notify config file in repository that users | |
65 | push changes to, they can manage their own subscriptions.''' |
|
65 | can push changes to, they can manage their own subscriptions.''' | |
66 |
|
66 | |||
67 | from mercurial.i18n import _ |
|
67 | from mercurial.i18n import _ | |
68 | from mercurial import patch, cmdutil, templater, util, mail |
|
68 | from mercurial import patch, cmdutil, templater, util, mail |
@@ -2924,14 +2924,15 b' def update(ui, repo, node=None, rev=None' | |||||
2924 | Use null as the revision to remove the working copy (like 'hg |
|
2924 | Use null as the revision to remove the working copy (like 'hg | |
2925 | clone -U'). |
|
2925 | clone -U'). | |
2926 |
|
2926 | |||
2927 |
When the working directory contains no uncommitted changes, it |
|
2927 | When the working directory contains no uncommitted changes, it | |
2928 |
replaced by the state of the requested revision from the |
|
2928 | will be replaced by the state of the requested revision from the | |
2929 |
When the requested revision is on a different branch, |
|
2929 | repository. When the requested revision is on a different branch, | |
2930 |
directory will additionally be switched to that |
|
2930 | the working directory will additionally be switched to that | |
|
2931 | branch. | |||
2931 |
|
2932 | |||
2932 | When there are uncommitted changes, use option -C to discard them, |
|
2933 | When there are uncommitted changes, use option -C to discard them, | |
2933 |
forcibly replacing the state of the working directory with the |
|
2934 | forcibly replacing the state of the working directory with the | |
2934 | revision. |
|
2935 | requested revision. | |
2935 |
|
2936 | |||
2936 | When there are uncommitted changes and option -C is not used, and |
|
2937 | When there are uncommitted changes and option -C is not used, and | |
2937 | the parent revision and requested revision are on the same branch, |
|
2938 | the parent revision and requested revision are on the same branch, |
@@ -54,8 +54,8 b' To use, configure notify extension and e' | |||||
54 |
|
54 | |||
55 | glob patterns are matched against path to repository root. |
|
55 | glob patterns are matched against path to repository root. | |
56 |
|
56 | |||
57 |
if you like, you can put notify config file in repository that users |
|
57 | if you like, you can put notify config file in repository that users | |
58 | push changes to, they can manage their own subscriptions. |
|
58 | can push changes to, they can manage their own subscriptions. | |
59 |
|
59 | |||
60 | no commands defined |
|
60 | no commands defined | |
61 | % commit |
|
61 | % commit |
General Comments 0
You need to be logged in to leave comments.
Login now