Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-clone @ 768:20e95c245bc3
Fix local file changes being ignored after non-branch merge
Bug introduced in eea96285cbf9
Spotted by TAH
author | mpm@selenic.com |
---|---|
date | Sat, 23 Jul 2005 10:00:56 -0500 |
parents | 7e4843b7efd2 |
children | ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4 |
rev | line source |
---|---|
550 | 1 #!/bin/bash |
2 | |
3 set -x | |
4 mkdir a | |
5 cd a | |
6 hg init | |
7 echo a > a | |
8 hg add a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
550
diff
changeset
|
9 hg commit -m test -d '0 0' |
550 | 10 |
11 # Default operation | |
12 hg clone . ../b | |
13 cd ../b | |
14 cat a | |
15 hg verify | |
16 | |
17 # No update | |
18 hg clone -U . ../c | |
19 cd ../c | |
20 cat a | |
21 hg verify | |
22 | |
23 # Default destination | |
24 mkdir ../d | |
25 cd ../d | |
26 hg clone ../a | |
27 cd a | |
28 hg cat a |