Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-walk.out @ 948:ffb0665028f0
Merge with BOS
author | mpm@selenic.com |
---|---|
date | Fri, 19 Aug 2005 16:43:30 -0800 |
parents | 5a034646e472 6d21a3488df9 |
children | 52d8d81e72ad |
comparison
equal
deleted
inserted
replaced
941:4cf418c2a013 | 948:ffb0665028f0 |
---|---|
10 adding beans/turtle | 10 adding beans/turtle |
11 adding mammals/skunk | 11 adding mammals/skunk |
12 adding mammals/Procyonidae/cacomistle | 12 adding mammals/Procyonidae/cacomistle |
13 adding mammals/Procyonidae/coatimundi | 13 adding mammals/Procyonidae/coatimundi |
14 adding mammals/Procyonidae/raccoon | 14 adding mammals/Procyonidae/raccoon |
15 f fennel fennel | 15 f fennel fennel |
16 f fenugreek fenugreek | 16 f fenugreek fenugreek |
17 f fiddlehead fiddlehead | 17 f fiddlehead fiddlehead |
18 f glob:glob glob:glob | 18 f glob:glob glob:glob |
19 f beans/black beans/black | 19 f beans/black beans/black |
20 f beans/borlotti beans/borlotti | 20 f beans/borlotti beans/borlotti |
21 f beans/kidney beans/kidney | 21 f beans/kidney beans/kidney |
22 f beans/navy beans/navy | 22 f beans/navy beans/navy |
23 f beans/pinto beans/pinto | 23 f beans/pinto beans/pinto |
24 f beans/turtle beans/turtle | 24 f beans/turtle beans/turtle |
25 f mammals/skunk mammals/skunk | 25 f mammals/skunk mammals/skunk |
26 f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle | 26 f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle |
27 f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi | 27 f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi |
28 f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon | 28 f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon |
29 f mammals/skunk skunk | 29 f mammals/skunk skunk |
30 f mammals/Procyonidae/cacomistle Procyonidae/cacomistle | 30 f mammals/Procyonidae/cacomistle Procyonidae/cacomistle |
31 f mammals/Procyonidae/coatimundi Procyonidae/coatimundi | 31 f mammals/Procyonidae/coatimundi Procyonidae/coatimundi |
32 f mammals/Procyonidae/raccoon Procyonidae/raccoon | 32 f mammals/Procyonidae/raccoon Procyonidae/raccoon |
33 f mammals/Procyonidae/cacomistle Procyonidae/cacomistle | 33 f mammals/Procyonidae/cacomistle Procyonidae/cacomistle |
34 f mammals/Procyonidae/coatimundi Procyonidae/coatimundi | 34 f mammals/Procyonidae/coatimundi Procyonidae/coatimundi |
35 f mammals/Procyonidae/raccoon Procyonidae/raccoon | 35 f mammals/Procyonidae/raccoon Procyonidae/raccoon |
36 f mammals/Procyonidae/cacomistle cacomistle | 36 f mammals/Procyonidae/cacomistle cacomistle |
37 f mammals/Procyonidae/coatimundi coatimundi | 37 f mammals/Procyonidae/coatimundi coatimundi |
38 f mammals/Procyonidae/raccoon raccoon | 38 f mammals/Procyonidae/raccoon raccoon |
39 f mammals/skunk ../skunk | 39 f mammals/skunk ../skunk |
40 f mammals/Procyonidae/cacomistle cacomistle | 40 f mammals/Procyonidae/cacomistle cacomistle |
41 f mammals/Procyonidae/coatimundi coatimundi | 41 f mammals/Procyonidae/coatimundi coatimundi |
42 f mammals/Procyonidae/raccoon raccoon | 42 f mammals/Procyonidae/raccoon raccoon |
43 f beans/black ../beans/black | 43 f beans/black ../beans/black |
44 f beans/borlotti ../beans/borlotti | 44 f beans/borlotti ../beans/borlotti |
45 f beans/kidney ../beans/kidney | 45 f beans/kidney ../beans/kidney |
46 f beans/navy ../beans/navy | 46 f beans/navy ../beans/navy |
47 f beans/pinto ../beans/pinto | 47 f beans/pinto ../beans/pinto |
48 f beans/turtle ../beans/turtle | 48 f beans/turtle ../beans/turtle |
49 f mammals/skunk skunk | 49 f mammals/skunk skunk |
50 f mammals/Procyonidae/cacomistle Procyonidae/cacomistle | 50 f mammals/Procyonidae/cacomistle Procyonidae/cacomistle |
51 f mammals/Procyonidae/coatimundi Procyonidae/coatimundi | 51 f mammals/Procyonidae/coatimundi Procyonidae/coatimundi |
52 f mammals/Procyonidae/raccoon Procyonidae/raccoon | 52 f mammals/Procyonidae/raccoon Procyonidae/raccoon |
53 f beans/black beans/black | 53 f beans/black beans/black |
54 f beans/borlotti beans/borlotti | 54 f beans/borlotti beans/borlotti |
55 f beans/kidney beans/kidney | 55 f beans/kidney beans/kidney |
56 f beans/navy beans/navy | 56 f beans/navy beans/navy |
57 f beans/pinto beans/pinto | 57 f beans/pinto beans/pinto |
58 f beans/turtle beans/turtle | 58 f beans/turtle beans/turtle |
59 f beans/black beans/black | 59 f beans/black beans/black |
60 f beans/borlotti beans/borlotti | 60 f beans/borlotti beans/borlotti |
61 f mammals/skunk mammals/skunk | 61 f mammals/skunk mammals/skunk |
62 f mammals/skunk mammals/skunk | 62 f mammals/skunk mammals/skunk |
63 f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle | 63 f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle |
64 f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi | 64 f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi |
65 f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon | 65 f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon |
66 abort: .. not under repository root | 66 abort: .. not under repository root |
67 abort: beans/../.. not under repository root | 67 abort: beans/../.. not under repository root |
68 f fennel fennel | 68 f fennel fennel |
69 f fenugreek fenugreek | 69 f fenugreek fenugreek |
70 f fiddlehead fiddlehead | 70 f fiddlehead fiddlehead |
71 f glob:glob glob:glob | 71 f glob:glob glob:glob |
72 f fenugreek fenugreek | 72 f fenugreek fenugreek |
73 f glob:glob glob:glob | 73 f glob:glob glob:glob |
74 f beans/black beans/black | 74 f beans/black beans/black |
75 f mammals/skunk mammals/skunk | 75 f mammals/skunk mammals/skunk |
76 f beans/black beans/black | 76 f beans/black beans/black |
77 f beans/black beans/black | 77 f beans/black beans/black |
78 f beans/borlotti beans/borlotti | 78 f beans/borlotti beans/borlotti |
79 f beans/kidney beans/kidney | 79 f beans/kidney beans/kidney |
80 f beans/navy beans/navy | 80 f beans/navy beans/navy |
81 f beans/pinto beans/pinto | 81 f beans/pinto beans/pinto |
82 f beans/turtle beans/turtle | 82 f beans/turtle beans/turtle |
83 NOEXIST: No such file or directory | 83 NOEXIST: No such file or directory |
84 fifo: unsupported file type (type is fifo) | 84 fifo: unsupported file type (type is fifo) |
85 m fenugreek fenugreek | 85 m fenugreek fenugreek exact |
86 m fenugreek fenugreek | 86 m fenugreek fenugreek exact |
87 f new new | 87 f new new exact |