Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-rename.out @ 1514:faf46d810a85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid to copy more than one file to the same destination file
author Robin Farine <robin.farine@terminus.org>
date Tue, 08 Nov 2005 10:35:13 -0800
parents 5c3b93b244aa
children 4bcbc126b80b
line wrap: on
line diff
--- a/tests/test-rename.out
+++ b/tests/test-rename.out
@@ -101,3 +101,15 @@ R d1/ba
 # replace a symlink with a file
 A d1/ca
 R d1/ba
+# do not copy more than one source file to the same destination file
+copying d1/d11/a1 to d3/d11/a1
+d3/b: not overwriting - d2/b collides with d1/b
+removing d1/d11/a1
+A d3/a
+A d3/b
+A d3/ba
+A d3/d11/a1
+R d1/a
+R d1/b
+R d1/ba
+R d1/d11/a1