Show More
@@ -26,13 +26,9 b'' | |||
|
26 | 26 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
27 | 27 | $ mv a c |
|
28 | 28 | |
|
29 | In theory, we shouldn't need the "-y" below, but it prevents this test | |
|
30 | from hanging when "hg update" erroneously prompts the user for "keep | |
|
31 | or delete". | |
|
32 | ||
|
33 | 29 | Should abort: |
|
34 | 30 | |
|
35 |
$ hg update |
|
|
31 | $ hg update 1 | |
|
36 | 32 | abort: uncommitted changes |
|
37 | 33 | (commit or update --clean to discard changes) |
|
38 | 34 | [255] |
@@ -40,5 +36,5 b' Should abort:' | |||
|
40 | 36 | |
|
41 | 37 | Should succeed: |
|
42 | 38 | |
|
43 |
$ hg update |
|
|
39 | $ hg update 1 | |
|
44 | 40 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now