Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-rename @ 1680:c21b54f7f7b8
Merge with crew
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 01 Feb 2006 19:18:15 +0100 |
| parents | f49f602fae92 |
| children | 91c56c427171 |
comparison
equal
deleted
inserted
replaced
| 1679:675ca845c2f8 | 1680:c21b54f7f7b8 |
|---|---|
| 132 echo "# do not copy more than one source file to the same destination file" | 132 echo "# do not copy more than one source file to the same destination file" |
| 133 mkdir d3 | 133 mkdir d3 |
| 134 hg rename d1/* d2/* d3 | 134 hg rename d1/* d2/* d3 |
| 135 hg status | 135 hg status |
| 136 hg update -C | 136 hg update -C |
| 137 | |
| 138 echo "# move a whole subtree with \"hg rename .\"" | |
| 139 mkdir d3 | |
| 140 (cd d1; hg rename . ../d3) | |
| 141 hg status | |
| 142 hg update -C | |
| 143 | |
| 144 echo "# move a whole subtree with \"hg rename --after .\"" | |
| 145 mkdir d3 | |
| 146 mv d1/* d3 | |
| 147 (cd d1; hg rename --after . ../d3) | |
| 148 hg status | |
| 149 hg update -C | |
| 150 | |
| 151 echo "# move the parent tree with \"hg rename ..\"" | |
| 152 (cd d1/d11; hg rename .. ../../d3) | |
| 153 hg status | |
| 154 hg update -C | |
| 155 | |
| 156 echo "# skip removed files" | |
| 157 hg remove d1/b | |
| 158 hg rename d1 d3 | |
| 159 hg status | |
| 160 hg update -C |