view tests/test-merge-default.out @ 8956:4b8d8f194e29

keyword: lowercase status flags of untracked files in kwfile output

Document the flags and their meanings in the command help
(thanks to timeless for bringing this to my attention).

adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail because not at a head
abort: branch 'default' has 3 heads - please merge with an explicit rev
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail because > 2 heads
abort: branch 'default' has 3 heads - please merge with an explicit rev
% should succeed
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should succeed - 2 heads
changeset:   1:ba677d0156c1
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     b

changeset:   3:903c264cdf57
parent:      1:ba677d0156c1
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     d

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should fail because at tip
abort: there is nothing to merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail because 1 head
abort: there is nothing to merge - use "hg update" instead