Show More
@@ -2857,14 +2857,21 b' def update(ui, repo, node=None, rev=None' | |||||
2857 | or the tip of the current branch if none is specified. Use null as |
|
2857 | or the tip of the current branch if none is specified. Use null as | |
2858 | the revision to remove the working copy (like 'hg clone -U'). |
|
2858 | the revision to remove the working copy (like 'hg clone -U'). | |
2859 |
|
2859 | |||
2860 | If the requested revision is a descendant of the working |
|
2860 | When the working dir contains no uncommitted changes, it will be | |
2861 | directory, any outstanding changes in the working directory will |
|
2861 | replaced by the state of the requested revision from the repo. When | |
2862 | be merged into the result. If it is not directly descended but is |
|
2862 | the requested revision is on a different branch, the working dir | |
2863 | on the same named branch, update aborts with a suggestion to use |
|
2863 | will additionally be switched to that branch. | |
2864 | merge or update -C instead. |
|
2864 | ||
2865 |
|
2865 | When there are uncommitted changes, use option -C to discard them, | ||
2866 | If the requested revision is on a different named branch and the |
|
2866 | forcibly replacing the state of the working dir with the requested | |
2867 | working directory is clean, update quietly switches branches. |
|
2867 | revision. | |
|
2868 | ||||
|
2869 | When there are uncommitted changes and option -C is not used, and | |||
|
2870 | the parent revision and requested revision are on the same branch, | |||
|
2871 | and one of them is an ancestor of the other, then the new working | |||
|
2872 | directory will contain the requested revision merged with the | |||
|
2873 | uncommitted changes. Otherwise, the update will fail with a | |||
|
2874 | suggestion to use 'merge' or 'update -C' instead. | |||
2868 |
|
2875 | |||
2869 | If you want to update just one file to an older revision, use revert. |
|
2876 | If you want to update just one file to an older revision, use revert. | |
2870 |
|
2877 |
General Comments 0
You need to be logged in to leave comments.
Login now