Mercurial > hg
view tests/test-add.out @ 9493:fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Remove extra documentation of -u/--unknown, as this is covered in
the option help already.
Like commands.status the code now zips the status flags.
Add more kwfiles tests.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Wed, 30 Sep 2009 23:59:03 +0200 |
parents | b2310903c462 |
children |
line wrap: on
line source
adding a ? a adding a 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 or 'hg update -C' to abandon M a ? a.orig % should fail a already tracked! M a ? a.orig % issue683 ? a.orig R a ? a.orig M a ? a.orig c: No such file or directory d: No such file or directory M a A c ? a.orig