Show More
@@ -502,11 +502,11 b' def update(repo, node, branchmerge, forc' | |||
|
502 | 502 | if pa == p1 or pa == p2: # linear |
|
503 | 503 | pass # all good |
|
504 | 504 | elif wc.files() or wc.deleted(): |
|
505 |
raise util.Abort(_("crosses branches ( |
|
|
506 |
" |
|
|
505 | raise util.Abort(_("crosses branches (merge branches or use" | |
|
506 | " --clean to discard changes)")) | |
|
507 | 507 | elif onode is None: |
|
508 |
raise util.Abort(_("crosses branches ( |
|
|
509 |
" |
|
|
508 | raise util.Abort(_("crosses branches (merge branches or use" | |
|
509 | " --check to force update)")) | |
|
510 | 510 | else: |
|
511 | 511 | # Allow jumping branches if clean and specific rev given |
|
512 | 512 | overwrite = True |
@@ -14,7 +14,7 b'' | |||
|
14 | 14 | $ hg update 1 |
|
15 | 15 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
16 | 16 | $ hg update |
|
17 |
abort: crosses branches ( |
|
|
17 | abort: crosses branches (merge branches or use --check to force update) | |
|
18 | 18 |
|
|
19 | 19 | $ hg update -c |
|
20 | 20 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -27,7 +27,7 b' or delete".' | |||
|
27 | 27 | Should abort: |
|
28 | 28 | |
|
29 | 29 | $ hg update -y 1 |
|
30 |
abort: crosses branches ( |
|
|
30 | abort: crosses branches (merge branches or use --clean to discard changes) | |
|
31 | 31 | [255] |
|
32 | 32 | $ mv c a |
|
33 | 33 |
@@ -167,7 +167,7 b' create a second head' | |||
|
167 | 167 | summary: 2 |
|
168 | 168 | |
|
169 | 169 | $ hg --debug up |
|
170 |
abort: crosses branches ( |
|
|
170 | abort: crosses branches (merge branches or use --clean to discard changes) | |
|
171 | 171 | [255] |
|
172 | 172 | $ hg --debug merge |
|
173 | 173 | abort: outstanding uncommitted changes (use 'hg status' to list changes) |
@@ -77,7 +77,7 b' Cases are run as shown in that table, ro' | |||
|
77 | 77 | parent=5 |
|
78 | 78 | |
|
79 | 79 | $ norevtest 'none clean same' clean 2 |
|
80 |
abort: crosses branches ( |
|
|
80 | abort: crosses branches (merge branches or use --check to force update) | |
|
81 | 81 | parent=2 |
|
82 | 82 | |
|
83 | 83 | |
@@ -100,12 +100,12 b' Cases are run as shown in that table, ro' | |||
|
100 | 100 | M foo |
|
101 | 101 | |
|
102 | 102 | $ revtest 'none dirty same' dirty 2 3 |
|
103 |
abort: crosses branches ( |
|
|
103 | abort: crosses branches (merge branches or use --clean to discard changes) | |
|
104 | 104 | parent=2 |
|
105 | 105 | M foo |
|
106 | 106 | |
|
107 | 107 | $ revtest 'none dirty cross' dirty 3 4 |
|
108 |
abort: crosses branches ( |
|
|
108 | abort: crosses branches (merge branches or use --clean to discard changes) | |
|
109 | 109 | parent=3 |
|
110 | 110 | M foo |
|
111 | 111 |
General Comments 0
You need to be logged in to leave comments.
Login now