tests/test-merge-closedheads.out
author Wagner Bruna <wbruna@softwareexpress.com.br>
Tue, 25 May 2010 13:20:33 -0300
branchstable
changeset 11244 cff6dfe28f02
parent 10355 a5576908b589
child 11516 ee876e42dd74
permissions -rw-r--r--
i18n-pt_BR: added message from 1b8aa9ffa7dc

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)