Show More
@@ -1912,7 +1912,7 b' def _update(' | |||
|
1912 | 1912 | hint=_(b"use 'hg update' or check 'hg heads'"), |
|
1913 | 1913 | ) |
|
1914 | 1914 | if not force and (wc.files() or wc.deleted()): |
|
1915 |
raise error. |
|
|
1915 | raise error.StateError( | |
|
1916 | 1916 | _(b"uncommitted changes"), |
|
1917 | 1917 | hint=_(b"use 'hg status' to list changes"), |
|
1918 | 1918 | ) |
@@ -282,7 +282,7 b' merge fails' | |||
|
282 | 282 | $ hg merge 2 |
|
283 | 283 | abort: uncommitted changes |
|
284 | 284 | (use 'hg status' to list changes) |
|
285 |
[2 |
|
|
285 | [20] | |
|
286 | 286 | merge expected! |
|
287 | 287 | $ hg merge -f 2 |
|
288 | 288 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -319,7 +319,7 b' merge of b should fail' | |||
|
319 | 319 | $ hg merge 2 |
|
320 | 320 | abort: uncommitted changes |
|
321 | 321 | (use 'hg status' to list changes) |
|
322 |
[2 |
|
|
322 | [20] | |
|
323 | 323 | merge of b expected |
|
324 | 324 | $ hg merge -f 2 |
|
325 | 325 | merging b |
General Comments 0
You need to be logged in to leave comments.
Login now