Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
1513:5c3b93b244aa 1514:faf46d810a85
99 A d1/ca 99 A d1/ca
100 R d1/ba 100 R d1/ba
101 # replace a symlink with a file 101 # replace a symlink with a file
102 A d1/ca 102 A d1/ca
103 R d1/ba 103 R d1/ba
104 # do not copy more than one source file to the same destination file
105 copying d1/d11/a1 to d3/d11/a1
106 d3/b: not overwriting - d2/b collides with d1/b
107 removing d1/d11/a1
108 A d3/a
109 A d3/b
110 A d3/ba
111 A d3/d11/a1
112 R d1/a
113 R d1/b
114 R d1/ba
115 R d1/d11/a1