Show More
@@ -711,7 +711,7 b' def update(repo, node, branchmerge, forc' | |||||
711 | hint=_("use 'hg update' " |
|
711 | hint=_("use 'hg update' " | |
712 | "or check 'hg heads'")) |
|
712 | "or check 'hg heads'")) | |
713 | if not force and (wc.files() or wc.deleted()): |
|
713 | if not force and (wc.files() or wc.deleted()): | |
714 |
raise util.Abort(_(" |
|
714 | raise util.Abort(_("uncommitted changes"), | |
715 | hint=_("use 'hg status' to list changes")) |
|
715 | hint=_("use 'hg status' to list changes")) | |
716 | for s in sorted(wc.substate): |
|
716 | for s in sorted(wc.substate): | |
717 | if wc.sub(s).dirty(): |
|
717 | if wc.sub(s).dirty(): |
@@ -19,7 +19,7 b' Local deleted a file, remote removed' | |||||
19 | Should fail, since there are deleted files: |
|
19 | Should fail, since there are deleted files: | |
20 |
|
20 | |||
21 | $ hg merge |
|
21 | $ hg merge | |
22 |
abort: |
|
22 | abort: uncommitted changes | |
23 | (use 'hg status' to list changes) |
|
23 | (use 'hg status' to list changes) | |
24 | [255] |
|
24 | [255] | |
25 |
|
25 |
@@ -140,7 +140,7 b' Contents of b should be "this is file b1' | |||||
140 | $ echo This is file b22 > b |
|
140 | $ echo This is file b22 > b | |
141 | merge fails |
|
141 | merge fails | |
142 | $ hg merge 2 |
|
142 | $ hg merge 2 | |
143 |
abort: |
|
143 | abort: uncommitted changes | |
144 | (use 'hg status' to list changes) |
|
144 | (use 'hg status' to list changes) | |
145 | [255] |
|
145 | [255] | |
146 | merge expected! |
|
146 | merge expected! | |
@@ -177,7 +177,7 b' merge expected!' | |||||
177 | $ echo This is file b33 > b |
|
177 | $ echo This is file b33 > b | |
178 | merge of b should fail |
|
178 | merge of b should fail | |
179 | $ hg merge 2 |
|
179 | $ hg merge 2 | |
180 |
abort: |
|
180 | abort: uncommitted changes | |
181 | (use 'hg status' to list changes) |
|
181 | (use 'hg status' to list changes) | |
182 | [255] |
|
182 | [255] | |
183 | merge of b expected |
|
183 | merge of b expected |
@@ -171,7 +171,7 b' create a second head' | |||||
171 | (commit and merge, or update --clean to discard changes) |
|
171 | (commit and merge, or update --clean to discard changes) | |
172 | [255] |
|
172 | [255] | |
173 | $ hg --debug merge |
|
173 | $ hg --debug merge | |
174 |
abort: |
|
174 | abort: uncommitted changes | |
175 | (use 'hg status' to list changes) |
|
175 | (use 'hg status' to list changes) | |
176 | [255] |
|
176 | [255] | |
177 | $ hg --debug merge -f |
|
177 | $ hg --debug merge -f |
General Comments 0
You need to be logged in to leave comments.
Login now