view tests/test-merge9.out @ 7007:a6b74fbb5ce0

fetch: added support for named branches Previously, fetch didn't really work when there were multiple named branches in the repository. Now it tries to do the right thing(tm) in all situations.
author Sune Foldager <cryo@cyanite.org>
date Mon, 08 Sep 2008 12:55:46 +0200
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