Mercurial > hg

view tests/test-merge-default.out @ 7512:0d488f7f321d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix test-acl failure on AIX due to read only LOGNAME. On AIX /etc/profile sets LOGNAME read only. This causes test-acl to fail when it comes to set LOGNAME in do_push(). Work around this by using env to set LOGNAME and run the command.
author Jim Hague <jim.hague@acm.org>
date Thu, 04 Dec 2008 13:42:47 +0000
parents 1fe6f365df2e
children 50b6af595e0c
line wrap: on
line source

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