Mercurial > hg

view tests/test-merge-default.out @ 6087:12856a1742dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
better handle errors with date parsing (issue983) Windows cannot always handle a 1970-01-01 parameter to time.mktime().
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Wed, 13 Feb 2008 16:46:43 +0100
parents 9cd6578750b9
children 4b0c9c674707
line wrap: on
line source

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