Mercurial > hg

comparison tests/test-remove.out @ 6356:b34b876d1f6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-remove: make it pass on Mac OS X 10.5
author Florent Guillaume <fg@nuxeo.com>
date Sat, 22 Mar 2008 21:13:22 +0100
parents 8e3b651382f5
children cb981fc955fb
comparison
equal deleted inserted replaced
6355:3b841c189ab7 6356:b34b876d1f6f
1 % file not managed 1 % file not managed
2 ? foo 2 ? foo
3 .: 3 ./foo
4 foo
5 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
6 % 00 state added, options none 5 % 00 state added, options none
7 not removing bar: file has been marked for add (use -f to force removal) 6 not removing bar: file has been marked for add (use -f to force removal)
8 A bar 7 A bar
9 .: 8 ./bar
10 bar 9 ./foo
11 foo
12 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 10 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
13 % 01 state clean, options none 11 % 01 state clean, options none
14 R foo 12 R foo
15 .:
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17 % 02 state modified, options none 14 % 02 state modified, options none
18 not removing foo: file is modified (use -f to force removal) 15 not removing foo: file is modified (use -f to force removal)
19 M foo 16 M foo
20 .: 17 ./foo
21 foo
22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 18 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
23 % 03 state missing, options none 19 % 03 state missing, options none
24 R foo 20 R foo
25 .:
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
27 % 10 state added, options -f 22 % 10 state added, options -f
28 ? bar 23 ? bar
29 .: 24 ./bar
30 bar 25 ./foo
31 foo
32 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 26 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
33 % 11 state clean, options -f 27 % 11 state clean, options -f
34 R foo 28 R foo
35 .:
36 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
37 % 12 state modified, options -f 30 % 12 state modified, options -f
38 R foo 31 R foo
39 .:
40 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 32 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
41 % 13 state missing, options -f 33 % 13 state missing, options -f
42 R foo 34 R foo
43 .:
44 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
45 % 20 state added, options -A 36 % 20 state added, options -A
46 not removing bar: file still exists (use -f to force removal) 37 not removing bar: file still exists (use -f to force removal)
47 A bar 38 A bar
48 .: 39 ./bar
49 bar 40 ./foo
50 foo
51 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 41 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
52 % 21 state clean, options -A 42 % 21 state clean, options -A
53 not removing foo: file still exists (use -f to force removal) 43 not removing foo: file still exists (use -f to force removal)
54 .: 44 ./foo
55 foo
56 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 45 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
57 % 22 state modified, options -A 46 % 22 state modified, options -A
58 not removing foo: file still exists (use -f to force removal) 47 not removing foo: file still exists (use -f to force removal)
59 M foo 48 M foo
60 .: 49 ./foo
61 foo
62 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
63 % 23 state missing, options -A 51 % 23 state missing, options -A
64 R foo 52 R foo
65 .:
66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 53 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
67 % 30 state added, options -Af 54 % 30 state added, options -Af
68 ? bar 55 ? bar
69 .: 56 ./bar
70 bar 57 ./foo
71 foo
72 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 58 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
73 % 31 state clean, options -Af 59 % 31 state clean, options -Af
74 R foo 60 R foo
75 .: 61 ./foo
76 foo
77 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 62 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
78 % 32 state modified, options -Af 63 % 32 state modified, options -Af
79 R foo 64 R foo
80 .: 65 ./foo
81 foo
82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
83 % 33 state missing, options -Af 67 % 33 state missing, options -Af
84 R foo 68 R foo
85 .:
86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 69 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
87 adding test/bar 70 adding test/bar
88 adding test/foo 71 adding test/foo
89 % dir, options none 72 % dir, options none
90 removing test/foo 73 removing test/foo
91 removing test/bar 74 removing test/bar
92 R test/bar 75 R test/bar
93 R test/foo 76 R test/foo
94 .: 77 ./foo
95 foo
96 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 78 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
97 % dir, options -f 79 % dir, options -f
98 removing test/foo 80 removing test/foo
99 removing test/bar 81 removing test/bar
100 R test/bar 82 R test/bar
101 R test/foo 83 R test/foo
102 .: 84 ./foo
103 foo
104 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 85 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
105 % dir, options -A 86 % dir, options -A
106 not removing test/foo: file still exists (use -f to force removal) 87 not removing test/foo: file still exists (use -f to force removal)
107 removing test/bar 88 removing test/bar
108 R test/bar 89 R test/bar
109 .: 90 ./foo
110 foo 91 ./test/foo
111 test
112
113 ./test:
114 foo
115 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 92 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
116 % dir, options -Af 93 % dir, options -Af
117 removing test/foo 94 removing test/foo
118 removing test/bar 95 removing test/bar
119 R test/bar 96 R test/bar
120 R test/foo 97 R test/foo
121 .: 98 ./foo
122 foo 99 ./test/foo
123 test
124
125 ./test:
126 foo
127 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 100 2 files updated, 0 files merged, 0 files removed, 0 files unresolved