tests/test-merge-default.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 30 Jan 2007 00:26:19 +0100
changeset 4053 994fec0ee900
parent 2903 013921c753bd
child 5224 9cd6578750b9
permissions -rw-r--r--
mtime can be -1 after a merge and cause tracebacks on win32. Output "unset" instead.

adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail because not at a head
abort: repo 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: repo 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
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should fail because 1 head
abort: there is nothing to merge - use "hg update" instead