Show More
| @@ -13,6 +13,12 b'' | |||||
| 13 | $ hg commit -A -m"comment #2" -d "1000000 0" |
|
13 | $ hg commit -A -m"comment #2" -d "1000000 0" | |
| 14 | removing b |
|
14 | removing b | |
| 15 | created new head |
|
15 | created new head | |
|
|
16 | $ hg update 1 | |||
|
|
17 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
|
18 | $ hg update | |||
|
|
19 | abort: crosses branches (use 'hg merge' or use 'hg update -c') | |||
|
|
20 | $ hg update -c | |||
|
|
21 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
| 16 | $ mv a c |
|
22 | $ mv a c | |
| 17 | in theory, we shouldn't need the "-y" below, but it prevents |
|
23 | in theory, we shouldn't need the "-y" below, but it prevents | |
| 18 | this test from hanging when "hg update" erroneously prompts the |
|
24 | this test from hanging when "hg update" erroneously prompts the | |
General Comments 0
You need to be logged in to leave comments.
Login now