Mercurial > hg
view tests/test-add.out @ 7812:18048153fd4e
test-convert-cvs*: mute output from "cvs up"
Apparently some versions of cvs outputs more than other versions. That is
however not relevant for these tests.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Fri, 27 Feb 2009 17:52:31 +0100 |
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