Mercurial > hg
diff tests/test-remove.out @ 8518:3f4f14eab085
update --clean: do not unlink added files (issue575)
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Tue, 19 May 2009 03:59:58 +0200 |
| parents | cb981fc955fb |
| children | 6062c6362b2e |
line wrap: on
line diff
--- a/tests/test-remove.out Sun May 17 16:25:48 2009 +0200 +++ b/tests/test-remove.out Tue May 19 03:59:58 2009 +0200 @@ -7,17 +7,23 @@ A bar ./bar ./foo -0 files updated, 0 files merged, 1 files removed, 0 files unresolved +0 files updated, 0 files merged, 0 files removed, 0 files unresolved % 01 state clean, options none R foo +? bar +./bar 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % 02 state modified, options none not removing foo: file is modified (use -f to force removal) M foo +? bar +./bar ./foo 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % 03 state missing, options none R foo +? bar +./bar 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % 10 state added, options -f ? bar @@ -38,18 +44,24 @@ A bar ./bar ./foo -0 files updated, 0 files merged, 1 files removed, 0 files unresolved +0 files updated, 0 files merged, 0 files removed, 0 files unresolved % 21 state clean, options -A not removing foo: file still exists (use -f to force removal) +? bar +./bar ./foo 0 files updated, 0 files merged, 0 files removed, 0 files unresolved % 22 state modified, options -A not removing foo: file still exists (use -f to force removal) M foo +? bar +./bar ./foo 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % 23 state missing, options -A R foo +? bar +./bar 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % 30 state added, options -Af ? bar