test-merge5.t
42 lines
| 1.1 KiB
| text/troff
|
Tads3Lexer
/ tests / test-merge5.t
|
r11978 | $ hg init | ||
$ echo This is file a1 > a | ||||
$ echo This is file b1 > b | ||||
$ hg add a b | ||||
|
r12155 | $ hg commit -m "commit #0" | ||
|
r11978 | $ echo This is file b22 > b | ||
|
r12155 | $ hg commit -m "comment #1" | ||
|
r11978 | $ hg update 0 | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ rm b | ||||
|
r12155 | $ hg commit -A -m "comment #2" | ||
|
r11978 | removing b | ||
created new head | ||||
|
r12154 | $ hg update 1 | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg update | ||||
|
r14485 | abort: crosses branches (merge branches or update --check to force update) | ||
|
r12316 | [255] | ||
|
r17849 | $ rm b | ||
$ hg update -c | ||||
abort: uncommitted local changes | ||||
[255] | ||||
$ hg revert b | ||||
|
r12154 | $ hg update -c | ||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
|
r11978 | $ mv a c | ||
|
r12155 | In theory, we shouldn't need the "-y" below, but it prevents this test | ||
from hanging when "hg update" erroneously prompts the user for "keep | ||||
or delete". | ||||
Should abort: | ||||
|
r11978 | $ hg update -y 1 | ||
|
r12681 | abort: crosses branches (merge branches or use --clean to discard changes) | ||
|
r12316 | [255] | ||
|
r11978 | $ mv c a | ||
|
r12155 | |||
Should succeed: | ||||
|
r11978 | $ hg update -y 1 | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||