diff tests/test-copy2.out @ 4779:37e11c768db9

merge with crew-stable
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 03 Jul 2007 03:14:18 -0300
parents 44e17f5029d0
children fc8b3e7cbf6b
line wrap: on
line diff
--- a/tests/test-copy2.out
+++ b/tests/test-copy2.out
@@ -1,5 +1,21 @@
+# should fail - foo is not managed
+foo: not copying - file is not managed
+abort: no files to copy
+? foo
+# dry-run; print a warning that this is not a real copy; foo is added
+foo was marked for addition. bar will not be committed as a copy.
+A foo
+# should print a warning that this is not a real copy; bar is added
+foo was marked for addition. bar will not be committed as a copy.
+A bar
+# should print a warning that this is not a real copy; foo is added
+bar was marked for addition. foo will not be committed as a copy.
+A foo
+# dry-run; should show that foo is clean
+C foo
 # should show copy
-copy: foo -> bar
+A bar
+  foo
 # shouldn't show copy
 # should match
    rev    offset  length   base linkrev nodeid       p1           p2
@@ -8,7 +24,8 @@ bar renamed from foo:2ed2a3912a0b2450204
 # should not be renamed
 bar not renamed
 # should show copy
-copy: foo -> bar
+M bar
+  foo
 # should show no parents for tip
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      69      0       1 6ca237634e1f 000000000000 000000000000