tests/test-merge-default.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 16 Dec 2006 22:58:10 +0100
changeset 3914 3c82ab166eea
parent 2903 013921c753bd
child 5224 9cd6578750b9
permissions -rw-r--r--
doc fix: hg tags defaults to current parent revision, too. Additionally use better language for the help text for tag, cat and manifest.

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