Show More
@@ -14,6 +14,21 b'' | |||||
14 | moving a/b/c/d/x to z/b/c/d/x (glob) |
|
14 | moving a/b/c/d/x to z/b/c/d/x (glob) | |
15 | moving a/b/c/d/y to z/b/c/d/y (glob) |
|
15 | moving a/b/c/d/y to z/b/c/d/y (glob) | |
16 | moving a/b/c/d/z to z/b/c/d/z (glob) |
|
16 | moving a/b/c/d/z to z/b/c/d/z (glob) | |
|
17 | ||||
|
18 | Test name collisions | |||
|
19 | ||||
|
20 | $ rm z/b/c/d/x | |||
|
21 | $ mkdir z/b/c/d/x | |||
|
22 | $ touch z/b/c/d/x/y | |||
|
23 | $ hg add z/b/c/d/x/y | |||
|
24 | abort: file 'z/b/c/d/x' in dirstate clashes with 'z/b/c/d/x/y' | |||
|
25 | [255] | |||
|
26 | $ rm -rf z/b/c/d | |||
|
27 | $ touch z/b/c/d | |||
|
28 | $ hg add z/b/c/d | |||
|
29 | abort: directory 'z/b/c/d' already in dirstate | |||
|
30 | [255] | |||
|
31 | ||||
17 | $ cd .. |
|
32 | $ cd .. | |
18 |
|
33 | |||
19 | Issue1790: dirstate entry locked into unset if file mtime is set into |
|
34 | Issue1790: dirstate entry locked into unset if file mtime is set into |
General Comments 0
You need to be logged in to leave comments.
Login now