Mercurial > hg

view tests/test-merge9.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 92ccccb55ba3
children 5a14a8f3b909
line wrap: on
line source

adding bar
adding foo
adding quux1
adding quux2
created new head
merging bar
merging bar failed!
merging foo and baz to baz
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
U bar
R baz
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging bar
merging bar failed!
merging baz and foo to baz
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
% show unresolved
U bar
R baz
% unmark baz
% show
U bar
U baz
% re-resolve baz
merging baz and foo to baz
% after
U bar
R baz
% resolve all
merging bar
warning: conflicts during merge.
merging bar failed!
% after
U bar
R baz