Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-clone-failure @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | 1b970cdab695 |
children |
rev | line source |
---|---|
834
78a9f95766dc
Use sh instead of bash in tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
1 #!/bin/sh |
550 | 2 |
3 # No local source | |
4 hg clone a b | |
5 echo $? | |
6 | |
7 # No remote source | |
8 hg clone http://127.0.0.1:3121/a b | |
9 echo $? | |
10 rm -rf b # work around bug with http clone | |
11 | |
12 # Inaccessible source | |
13 mkdir a | |
14 chmod 000 a | |
15 hg clone a b | |
16 echo $? | |
17 | |
18 # Inaccessible destination | |
19 mkdir b | |
20 cd b | |
21 hg init | |
22 hg clone . ../a | |
23 echo $? | |
24 cd .. | |
25 chmod 700 a | |
3988
9dcf9d45cab8
Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
839
diff
changeset
|
26 rm -r a b |
550 | 27 |
28 # Source of wrong type | |
5087
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
29 if "$TESTDIR/hghave" -q fifo; then |
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
30 mkfifo a |
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
31 hg clone a b |
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
32 echo $? |
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
33 rm a |
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
34 else |
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
35 echo "abort: repository a not found!" |
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
36 echo 255 |
1b970cdab695
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com>
parents:
3988
diff
changeset
|
37 fi |
550 | 38 |
39 # Default destination, same directory | |
40 mkdir q | |
41 cd q | |
42 hg init | |
43 cd .. | |
44 hg clone q | |
45 | |
46 true |