32 not removing bar: file has been marked for add (use forget to undo) |
44 not removing bar: file has been marked for add (use forget to undo) |
33 exit code: 1 |
45 exit code: 1 |
34 A bar |
46 A bar |
35 ./bar |
47 ./bar |
36 ./foo |
48 ./foo |
|
49 \r (no-eol) (esc) |
|
50 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
51 \r (no-eol) (esc) |
37 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
52 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
38 |
53 |
39 01 state clean, options none |
54 01 state clean, options none |
40 |
55 |
41 $ remove foo |
56 $ remove foo |
42 exit code: 0 |
57 exit code: 0 |
43 R foo |
58 R foo |
44 ? bar |
59 ? bar |
45 ./bar |
60 ./bar |
|
61 \r (no-eol) (esc) |
|
62 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
63 \r (no-eol) (esc) |
46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
64 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
47 |
65 |
48 02 state modified, options none |
66 02 state modified, options none |
49 |
67 |
50 $ echo b >> foo |
68 $ echo b >> foo |
53 exit code: 1 |
71 exit code: 1 |
54 M foo |
72 M foo |
55 ? bar |
73 ? bar |
56 ./bar |
74 ./bar |
57 ./foo |
75 ./foo |
|
76 \r (no-eol) (esc) |
|
77 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
78 \r (no-eol) (esc) |
58 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
59 |
80 |
60 03 state missing, options none |
81 03 state missing, options none |
61 |
82 |
62 $ rm foo |
83 $ rm foo |
63 $ remove foo |
84 $ remove foo |
64 exit code: 0 |
85 exit code: 0 |
65 R foo |
86 R foo |
66 ? bar |
87 ? bar |
67 ./bar |
88 ./bar |
|
89 \r (no-eol) (esc) |
|
90 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
91 \r (no-eol) (esc) |
68 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 |
69 |
93 |
70 10 state added, options -f |
94 10 state added, options -f |
71 |
95 |
72 $ echo b > bar |
96 $ echo b > bar |
82 11 state clean, options -f |
106 11 state clean, options -f |
83 |
107 |
84 $ remove -f foo |
108 $ remove -f foo |
85 exit code: 0 |
109 exit code: 0 |
86 R foo |
110 R foo |
|
111 \r (no-eol) (esc) |
|
112 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
113 \r (no-eol) (esc) |
87 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
114 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88 |
115 |
89 12 state modified, options -f |
116 12 state modified, options -f |
90 |
117 |
91 $ echo b >> foo |
118 $ echo b >> foo |
92 $ remove -f foo |
119 $ remove -f foo |
93 exit code: 0 |
120 exit code: 0 |
94 R foo |
121 R foo |
|
122 \r (no-eol) (esc) |
|
123 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
124 \r (no-eol) (esc) |
95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
125 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
96 |
126 |
97 13 state missing, options -f |
127 13 state missing, options -f |
98 |
128 |
99 $ rm foo |
129 $ rm foo |
100 $ remove -f foo |
130 $ remove -f foo |
101 exit code: 0 |
131 exit code: 0 |
102 R foo |
132 R foo |
|
133 \r (no-eol) (esc) |
|
134 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
135 \r (no-eol) (esc) |
103 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
136 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
104 |
137 |
105 20 state added, options -A |
138 20 state added, options -A |
106 |
139 |
107 $ echo b > bar |
140 $ echo b > bar |
110 not removing bar: file still exists |
143 not removing bar: file still exists |
111 exit code: 1 |
144 exit code: 1 |
112 A bar |
145 A bar |
113 ./bar |
146 ./bar |
114 ./foo |
147 ./foo |
|
148 \r (no-eol) (esc) |
|
149 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
150 \r (no-eol) (esc) |
115 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
151 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
116 |
152 |
117 21 state clean, options -A |
153 21 state clean, options -A |
118 |
154 |
119 $ remove -A foo |
155 $ remove -A foo |
132 exit code: 1 |
168 exit code: 1 |
133 M foo |
169 M foo |
134 ? bar |
170 ? bar |
135 ./bar |
171 ./bar |
136 ./foo |
172 ./foo |
|
173 \r (no-eol) (esc) |
|
174 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
175 \r (no-eol) (esc) |
137 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
176 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
138 |
177 |
139 23 state missing, options -A |
178 23 state missing, options -A |
140 |
179 |
141 $ rm foo |
180 $ rm foo |
142 $ remove -A foo |
181 $ remove -A foo |
143 exit code: 0 |
182 exit code: 0 |
144 R foo |
183 R foo |
145 ? bar |
184 ? bar |
146 ./bar |
185 ./bar |
|
186 \r (no-eol) (esc) |
|
187 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
188 \r (no-eol) (esc) |
147 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
189 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
148 |
190 |
149 30 state added, options -Af |
191 30 state added, options -Af |
150 |
192 |
151 $ echo b > bar |
193 $ echo b > bar |
162 |
204 |
163 $ remove -Af foo |
205 $ remove -Af foo |
164 exit code: 0 |
206 exit code: 0 |
165 R foo |
207 R foo |
166 ./foo |
208 ./foo |
|
209 \r (no-eol) (esc) |
|
210 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
211 \r (no-eol) (esc) |
167 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
212 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
168 |
213 |
169 32 state modified, options -Af |
214 32 state modified, options -Af |
170 |
215 |
171 $ echo b >> foo |
216 $ echo b >> foo |
172 $ remove -Af foo |
217 $ remove -Af foo |
173 exit code: 0 |
218 exit code: 0 |
174 R foo |
219 R foo |
175 ./foo |
220 ./foo |
|
221 \r (no-eol) (esc) |
|
222 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
223 \r (no-eol) (esc) |
176 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
224 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
177 |
225 |
178 33 state missing, options -Af |
226 33 state missing, options -Af |
179 |
227 |
180 $ rm foo |
228 $ rm foo |
181 $ remove -Af foo |
229 $ remove -Af foo |
182 exit code: 0 |
230 exit code: 0 |
183 R foo |
231 R foo |
|
232 \r (no-eol) (esc) |
|
233 updating [===========================================>] 1/1\r (no-eol) (esc) |
|
234 \r (no-eol) (esc) |
184 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
235 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
185 |
236 |
186 test some directory stuff |
237 test some directory stuff |
187 |
238 |
188 $ mkdir test |
239 $ mkdir test |
237 exit code: 0 |
297 exit code: 0 |
238 R test/bar |
298 R test/bar |
239 R test/foo |
299 R test/foo |
240 ./foo |
300 ./foo |
241 ./test/foo |
301 ./test/foo |
|
302 \r (no-eol) (esc) |
|
303 updating [===========================================>] 2/2\r (no-eol) (esc) |
|
304 \r (no-eol) (esc) |
242 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
305 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
243 |
306 |
244 test remove dropping empty trees (issue1861) |
307 test remove dropping empty trees (issue1861) |
245 |
308 |
246 $ mkdir -p issue1861/b/c |
309 $ mkdir -p issue1861/b/c |