view tests/test-merge-closedheads.out @ 10143:f6ac05b5684b

test-help: improve test coverage Adds a test for displaying a command list with a command with no help text. Extends test coverage of commands.help_ by 1 line.
author Henri Wiechers <hwiechers@gmail.com>
date Thu, 24 Dec 2009 18:53:35 +0200
parents ca8d05e1f1d1
children a5576908b589
line wrap: on
line source

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
% 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)