tests/test-mq-merge.out
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Wed, 08 Apr 2009 02:38:23 +0900
changeset 8060 84d0fe34427b
parent 7627 fb32ae9c76e7
child 8433 9a398dd53bcc
permissions -rw-r--r--
run-tests: detect when hghave fails to check for a feature and fail test hghave exitcode != 0 might mean that hghave failed to check for feature avaibility. Detect those cases, and fail the test, instead of skipping it.

adding a
adding b
copy .hg/patches to .hg/patches.1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
M b
created new head
a
b
merging with queue at: .hg/patches.1
applying rm_a
now at: rm_a
b
patch queue now empty

% init t2
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% create the reference queue
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% merge
merging with queue at refqueue
(working directory not at tip)
applying patcha
now at: patcha