Mercurial > hg
view tests/test-add.out @ 6868:93b03f1be289
convert: Fix debugging output when running multiple commands with xargs.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 08 Aug 2008 18:37:50 +0200 |
parents | 4b0c9c674707 |
children | 92ccccb55ba3 |
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 There are unresolved merges, you can redo the full merge using: hg update -C 2 hg merge 1 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