Show More
@@ -5850,7 +5850,7 b' def update(ui, repo, node=None, rev=None' | |||||
5850 | if check: |
|
5850 | if check: | |
5851 | c = repo[None] |
|
5851 | c = repo[None] | |
5852 | if c.dirty(merge=False, branch=False, missing=True): |
|
5852 | if c.dirty(merge=False, branch=False, missing=True): | |
5853 |
raise util.Abort(_("uncommitted |
|
5853 | raise util.Abort(_("uncommitted changes")) | |
5854 | if rev is None: |
|
5854 | if rev is None: | |
5855 | rev = repo[repo[None].branch()].rev() |
|
5855 | rev = repo[repo[None].branch()].rev() | |
5856 | mergemod._checkunknown(repo, repo[None], repo[rev]) |
|
5856 | mergemod._checkunknown(repo, repo[None], repo[rev]) |
@@ -669,7 +669,7 b' def update(repo, node, branchmerge, forc' | |||||
669 | 2 = abort: uncommitted changes (commit and merge, or update --clean to |
|
669 | 2 = abort: uncommitted changes (commit and merge, or update --clean to | |
670 | discard changes) |
|
670 | discard changes) | |
671 | 3 = abort: uncommitted changes (commit or update --clean to discard changes) |
|
671 | 3 = abort: uncommitted changes (commit or update --clean to discard changes) | |
672 |
4 = abort: uncommitted |
|
672 | 4 = abort: uncommitted changes (checked in commands.py) | |
673 | 5 = incompatible options (checked in commands.py) |
|
673 | 5 = incompatible options (checked in commands.py) | |
674 |
|
674 | |||
675 | Return the same tuple as applyupdates(). |
|
675 | Return the same tuple as applyupdates(). |
@@ -293,7 +293,7 b' test for rename awareness of case-foldin' | |||||
293 | [255] |
|
293 | [255] | |
294 |
|
294 | |||
295 | $ hg update --check |
|
295 | $ hg update --check | |
296 |
abort: uncommitted |
|
296 | abort: uncommitted changes | |
297 | [255] |
|
297 | [255] | |
298 |
|
298 | |||
299 | $ hg update --clean |
|
299 | $ hg update --clean |
@@ -1104,7 +1104,7 b' Rollback on largefiles.' | |||||
1104 |
|
1104 | |||
1105 | "update --check" refuses to update with uncommitted changes. |
|
1105 | "update --check" refuses to update with uncommitted changes. | |
1106 | $ hg update --check 8 |
|
1106 | $ hg update --check 8 | |
1107 |
abort: uncommitted |
|
1107 | abort: uncommitted changes | |
1108 | [255] |
|
1108 | [255] | |
1109 |
|
1109 | |||
1110 | "update --clean" leaves correct largefiles in working copy, even when there is |
|
1110 | "update --clean" leaves correct largefiles in working copy, even when there is |
@@ -19,7 +19,7 b'' | |||||
19 | [255] |
|
19 | [255] | |
20 | $ rm b |
|
20 | $ rm b | |
21 | $ hg update -c |
|
21 | $ hg update -c | |
22 |
abort: uncommitted |
|
22 | abort: uncommitted changes | |
23 | [255] |
|
23 | [255] | |
24 | $ hg revert b |
|
24 | $ hg revert b | |
25 | $ hg update -c |
|
25 | $ hg update -c |
@@ -157,12 +157,12 b' Cases are run as shown in that table, ro' | |||||
157 | parent=2 |
|
157 | parent=2 | |
158 |
|
158 | |||
159 | $ revtest '-c dirty linear' dirty 1 2 -c |
|
159 | $ revtest '-c dirty linear' dirty 1 2 -c | |
160 |
abort: uncommitted |
|
160 | abort: uncommitted changes | |
161 | parent=1 |
|
161 | parent=1 | |
162 | M foo |
|
162 | M foo | |
163 |
|
163 | |||
164 | $ revtest '-c dirtysub linear' dirtysub 1 2 -c |
|
164 | $ revtest '-c dirtysub linear' dirtysub 1 2 -c | |
165 |
abort: uncommitted |
|
165 | abort: uncommitted changes | |
166 | parent=1 |
|
166 | parent=1 | |
167 | M sub/suba |
|
167 | M sub/suba | |
168 |
|
168 |
General Comments 0
You need to be logged in to leave comments.
Login now