test-merge5.t
35 lines
| 1.0 KiB
| text/troff
|
Tads3Lexer
/ tests / test-merge5.t
|
r11978 | $ mkdir t | ||
$ cd t | ||||
$ hg init | ||||
$ echo This is file a1 > a | ||||
$ echo This is file b1 > b | ||||
$ hg add a b | ||||
$ hg commit -m "commit #0" -d "1000000 0" | ||||
$ echo This is file b22 > b | ||||
$ hg commit -m"comment #1" -d "1000000 0" | ||||
$ hg update 0 | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ rm b | ||||
$ hg commit -A -m"comment #2" -d "1000000 0" | ||||
removing b | ||||
created new head | ||||
|
r12154 | $ hg update 1 | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg update | ||||
abort: crosses branches (use 'hg merge' or use 'hg update -c') | ||||
$ hg update -c | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
|
r11978 | $ mv a c | ||
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 | ||||
$ hg update -y 1 | ||||
abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes) | ||||
$ mv c a | ||||
should succeed | ||||
$ hg update -y 1 | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ exit 0 | ||||