Mercurial > hg

comparison tests/test-issue322 @ 4659:7a7d4937272b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Kill trailing spaces
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 21 Jun 2007 09:25:49 +0200
parents 9dcf9d45cab8
children 1de6e7e1bb9f
comparison
equal deleted inserted replaced
4658:17f5d2069551 4659:7a7d4937272b
2 # http://www.selenic.com/mercurial/bts/issue322 2 # http://www.selenic.com/mercurial/bts/issue322
3 3
4 echo % file replaced with directory 4 echo % file replaced with directory
5 5
6 hg init a 6 hg init a
7 cd a 7 cd a
8 echo a > a 8 echo a > a
9 hg commit -Ama 9 hg commit -Ama
10 rm a 10 rm a
11 mkdir a 11 mkdir a
12 echo a > a/a 12 echo a > a/a
13 13
14 echo % should fail - would corrupt dirstate 14 echo % should fail - would corrupt dirstate
15 hg add a/a 15 hg add a/a
16 16
17 cd .. 17 cd ..
18 18
19 echo % directory replaced with file 19 echo % directory replaced with file
20 20
21 hg init c 21 hg init c
22 cd c 22 cd c