--- a/tests/test-copy.t Fri Apr 09 11:32:19 2021 -0400
+++ b/tests/test-copy.t Fri Apr 09 08:46:40 2021 -0700
@@ -277,19 +277,25 @@
$ rm baz xyzzy
-Test unmarking copy of a single file
+Test unmarking copy/rename of a single file
# Set up by creating a copy
$ hg cp bar baz
-# Test uncopying a non-existent file
+# Test unmarking as copy a non-existent file
$ hg copy --forget non-existent
non-existent: $ENOENT$
-# Test uncopying an tracked but unrelated file
+ $ hg rename --forget non-existent
+ non-existent: $ENOENT$
+# Test unmarking as copy an tracked but unrelated file
$ hg copy --forget foo
foo: not unmarking as copy - file is not marked as copied
-# Test uncopying a copy source
+ $ hg rename --forget foo
+ foo: not unmarking as copy - file is not marked as copied
+# Test unmarking as copy a copy source
$ hg copy --forget bar
bar: not unmarking as copy - file is not marked as copied
+ $ hg rename --forget bar
+ bar: not unmarking as copy - file is not marked as copied
# baz should still be marked as a copy
$ hg st -C
A baz
@@ -298,17 +304,38 @@
$ hg copy --forget baz
$ hg st -C
A baz
-# Test uncopy with matching an non-matching patterns
+ $ rm bar
+ $ hg rename --after bar baz
+ $ hg st -C
+ A baz
+ bar
+ R bar
+ $ hg rename --forget baz
+ $ hg st -C
+ A baz
+ R bar
+ $ hg revert bar
+# Test unmarking as copy with matching an non-matching patterns
$ hg cp bar baz --after
$ hg copy --forget bar baz
bar: not unmarking as copy - file is not marked as copied
+ $ hg cp bar baz --after
+ $ hg rename --forget bar baz
+ bar: not unmarking as copy - file is not marked as copied
$ hg st -C
A baz
-# Test uncopy with no exact matches
+# Test unmarking as copy with no exact matches
$ hg cp bar baz --after
$ hg copy --forget .
$ hg st -C
A baz
+ $ hg cp bar baz --after
+ $ hg st -C
+ A baz
+ bar
+ $ hg rename --forget .
+ $ hg st -C
+ A baz
$ hg forget baz
$ rm baz