Mercurial > hg
view tests/test-merge9.out @ 7316:9737041646bc
bookmarks: Use dirstate to determine the current node in addchangegroup
Using the changectx might result in a lookup error during the strip command.
Thefore we use the current dirstate to get the parents of the working directory.
author | David Soria Parra <dsp@php.net> |
---|---|
date | Wed, 05 Nov 2008 03:53:34 +0100 |
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