tests/test-remove.out
changeset 2309 b2f37c7026ca
parent 2302 506fcf779cae
child 3192 096f1c73cdc3
--- a/tests/test-remove.out
+++ b/tests/test-remove.out
@@ -1,3 +1,4 @@
+not removing foo: file is not managed
 abort: no files specified
 undeleting foo
 removing foo
@@ -50,4 +51,8 @@ diff -r 8ba83d44753d -r a1fce69c50d9 foo
 -a
 
 
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+not removing a: file has been marked for add (use -f to force removal)
+adding a
+adding b
+not removing b: file is modified (use -f to force removal)
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved