test-merge4.t
25 lines
| 654 B
| text/troff
|
Tads3Lexer
/ tests / test-merge4.t
Pradeepkumar Gayam
|
r11977 | $ hg init | ||
| $ echo This is file a1 > a | ||||
| $ hg add a | ||||
Martin Geisler
|
r12156 | $ hg commit -m "commit #0" | ||
|
Pradeepkumar Gayam
|
r11977 | $ echo This is file b1 > b | ||
| $ hg add b | ||||
|
Martin Geisler
|
r12156 | $ hg commit -m "commit #1" | ||
|
Pradeepkumar Gayam
|
r11977 | $ hg update 0 | ||
| 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| $ echo This is file c1 > c | ||||
| $ hg add c | ||||
|
Martin Geisler
|
r12156 | $ hg commit -m "commit #2" | ||
|
Pradeepkumar Gayam
|
r11977 | created new head | ||
| $ hg merge 1 | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | ||||
| $ rm b | ||||
| $ echo This is file c22 > c | ||||
Patrick Mezard
|
r16536 | |||
| Test hg behaves when committing with a missing file added by a merge | ||||
|
Martin Geisler
|
r12156 | $ hg commit -m "commit #3" | ||
|
Patrick Mezard
|
r16536 | abort: cannot commit merge with missing files | ||
| [255] | ||||
|
Pradeepkumar Gayam
|
r11977 | |||