Mercurial > hg
view tests/test-add.out @ 7006:92d44ec32430
branch: added more support for named branches
hg branch now has a -C (--clean) option, to reset the current (dirstate)
branch to the branch of the last commit (first parent).
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Mon, 08 Sep 2008 12:55:27 +0200 |
parents | 92ccccb55ba3 |
children | 9fe7e6acf525 |
line wrap: on
line source
adding a ? a adding a A a A a ? b A a A b % should fail b already tracked! A a A b % should fail a already tracked! 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head merging a warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges M a ? a.orig % should fail a already tracked! M a ? a.orig % issue683 R a ? a.orig M a ? a.orig c does not exist! d does not exist! M a A c ? a.orig