tests/test-merge-closedheads.out
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Sat, 27 Feb 2010 19:58:59 +0900
branchstable
changeset 10554 8522310dcaf1
parent 10355 a5576908b589
child 11516 ee876e42dd74
permissions -rw-r--r--
i18n-ja: synchronized with 4462760d6cfc

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
(run 'hg heads .' to see heads)
% 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)