test-merge-closedheads.out
30 lines
| 1.2 KiB
| text/plain
|
TextLexer
/ tests / test-merge-closedheads.out
John Mulligan
|
r8694 | adding foo | ||
| adding bar | ||||
| adding baz | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| created new head | ||||
| 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| created new head | ||||
| % fail with three heads | ||||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| abort: branch 'default' has 3 heads - please merge with an explicit rev | ||||
Benoit Boissinot
|
r10355 | (run 'hg heads .' to see heads) | ||
|
John Mulligan
|
r8694 | % close one of the heads | ||
| 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| % succeed with two open heads | ||||
| 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | ||||
Martin Geisler
|
r11516 | % hg update -C 8 | ||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| % hg branch some-branch | ||||
| marked working directory as branch some-branch | ||||
| % hg commit | ||||
| % hg commit --close-branch | ||||
| % hg update default | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| % hg merge some-branch | ||||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | ||||
| % hg commit (no reopening of some-branch) | ||||