1 # rename a single file |
1 # rename a single file |
2 A d2/c |
2 A d2/c |
|
3 d1/d11/a1 |
3 R d1/d11/a1 |
4 R d1/d11/a1 |
4 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5 # rename --after a single file |
6 # rename --after a single file |
6 A d2/c |
7 A d2/c |
|
8 d1/d11/a1 |
7 R d1/d11/a1 |
9 R d1/d11/a1 |
8 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
10 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9 # move a single file to an existing directory |
11 # move a single file to an existing directory |
10 A d2/a1 |
12 A d2/a1 |
|
13 d1/d11/a1 |
11 R d1/d11/a1 |
14 R d1/d11/a1 |
12 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
15 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
13 # move --after a single file to an existing directory |
16 # move --after a single file to an existing directory |
14 A d2/a1 |
17 A d2/a1 |
|
18 d1/d11/a1 |
15 R d1/d11/a1 |
19 R d1/d11/a1 |
16 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
20 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
17 # rename a file using a relative path |
21 # rename a file using a relative path |
18 A d1/d11/e |
22 A d1/d11/e |
|
23 d2/b |
19 R d2/b |
24 R d2/b |
20 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
25 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
21 # rename --after a file using a relative path |
26 # rename --after a file using a relative path |
22 A d1/d11/e |
27 A d1/d11/e |
|
28 d2/b |
23 R d2/b |
29 R d2/b |
24 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
30 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
25 # rename directory d1 as d3 |
31 # rename directory d1 as d3 |
26 copying d1/a to d3/a |
32 copying d1/a to d3/a |
27 copying d1/b to d3/b |
33 copying d1/b to d3/b |
48 removing d1/a |
58 removing d1/a |
49 removing d1/b |
59 removing d1/b |
50 removing d1/ba |
60 removing d1/ba |
51 removing d1/d11/a1 |
61 removing d1/d11/a1 |
52 A d3/a |
62 A d3/a |
53 A d3/b |
63 d1/a |
54 A d3/ba |
64 A d3/b |
55 A d3/d11/a1 |
65 d1/b |
|
66 A d3/ba |
|
67 d1/ba |
|
68 A d3/d11/a1 |
|
69 d1/d11/a1 |
56 R d1/a |
70 R d1/a |
57 R d1/b |
71 R d1/b |
58 R d1/ba |
72 R d1/ba |
59 R d1/d11/a1 |
73 R d1/d11/a1 |
60 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
74 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
61 # move a directory using a relative path |
75 # move a directory using a relative path |
62 copying ../d1/d11/a1 to d3/d11/a1 |
76 copying ../d1/d11/a1 to d3/d11/a1 |
63 removing ../d1/d11/a1 |
77 removing ../d1/d11/a1 |
64 A d2/d3/d11/a1 |
78 A d2/d3/d11/a1 |
|
79 d1/d11/a1 |
65 R d1/d11/a1 |
80 R d1/d11/a1 |
66 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
81 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
67 # move --after a directory using a relative path |
82 # move --after a directory using a relative path |
68 copying ../d1/d11/a1 to d3/d11/a1 |
83 copying ../d1/d11/a1 to d3/d11/a1 |
69 removing ../d1/d11/a1 |
84 removing ../d1/d11/a1 |
70 A d2/d3/d11/a1 |
85 A d2/d3/d11/a1 |
|
86 d1/d11/a1 |
71 R d1/d11/a1 |
87 R d1/d11/a1 |
72 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
88 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
73 # move directory d1/d11 to an existing directory d2 (removes empty d1) |
89 # move directory d1/d11 to an existing directory d2 (removes empty d1) |
74 copying d1/d11/a1 to d2/d11/a1 |
90 copying d1/d11/a1 to d2/d11/a1 |
75 removing d1/d11/a1 |
91 removing d1/d11/a1 |
76 A d2/d11/a1 |
92 A d2/d11/a1 |
|
93 d1/d11/a1 |
77 R d1/d11/a1 |
94 R d1/d11/a1 |
78 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
95 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
79 # move directories d1 and d2 to a new directory d3 |
96 # move directories d1 and d2 to a new directory d3 |
80 copying d1/a to d3/d1/a |
97 copying d1/a to d3/d1/a |
81 copying d1/b to d3/d1/b |
98 copying d1/b to d3/d1/b |
161 copying d1/a to d2/d21/a |
195 copying d1/a to d2/d21/a |
162 copying d1/d11/a1 to d2/d21/a1 |
196 copying d1/d11/a1 to d2/d21/a1 |
163 removing d1/a |
197 removing d1/a |
164 removing d1/d11/a1 |
198 removing d1/d11/a1 |
165 A d2/d21/a |
199 A d2/d21/a |
|
200 d1/a |
166 A d2/d21/a1 |
201 A d2/d21/a1 |
|
202 d1/d11/a1 |
167 R d1/a |
203 R d1/a |
168 R d1/d11/a1 |
204 R d1/d11/a1 |
169 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
205 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
170 # move every file under d1 starting with an 'a' to d2/d21 (regexp) |
206 # move every file under d1 starting with an 'a' to d2/d21 (regexp) |
171 copying d1/a to d2/d21/a |
207 copying d1/a to d2/d21/a |
172 copying d1/d11/a1 to d2/d21/a1 |
208 copying d1/d11/a1 to d2/d21/a1 |
173 removing d1/a |
209 removing d1/a |
174 removing d1/d11/a1 |
210 removing d1/d11/a1 |
175 A d2/d21/a |
211 A d2/d21/a |
|
212 d1/a |
176 A d2/d21/a1 |
213 A d2/d21/a1 |
|
214 d1/d11/a1 |
177 R d1/a |
215 R d1/a |
178 R d1/d11/a1 |
216 R d1/d11/a1 |
179 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
217 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
180 # attempt to overwrite an existing file |
218 # attempt to overwrite an existing file |
181 d1/ca: not overwriting - file exists |
219 d1/ca: not overwriting - file exists |
182 ? d1/ca |
220 ? d1/ca |
183 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
221 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
184 # forced overwrite of an existing file |
222 # forced overwrite of an existing file |
185 A d1/ca |
223 A d1/ca |
|
224 d1/ba |
186 R d1/ba |
225 R d1/ba |
187 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
226 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
188 # replace a symlink with a file |
227 # replace a symlink with a file |
189 A d1/ca |
228 A d1/ca |
|
229 d1/ba |
190 R d1/ba |
230 R d1/ba |
191 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
231 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
192 # do not copy more than one source file to the same destination file |
232 # do not copy more than one source file to the same destination file |
193 copying d1/d11/a1 to d3/d11/a1 |
233 copying d1/d11/a1 to d3/d11/a1 |
194 d3/b: not overwriting - d2/b collides with d1/b |
234 d3/b: not overwriting - d2/b collides with d1/b |
195 removing d1/d11/a1 |
235 removing d1/d11/a1 |
196 A d3/a |
236 A d3/a |
197 A d3/b |
237 d1/a |
198 A d3/ba |
238 A d3/b |
199 A d3/d11/a1 |
239 d1/b |
|
240 A d3/ba |
|
241 d1/ba |
|
242 A d3/d11/a1 |
|
243 d1/d11/a1 |
200 R d1/a |
244 R d1/a |
201 R d1/b |
245 R d1/b |
202 R d1/ba |
246 R d1/ba |
203 R d1/d11/a1 |
247 R d1/d11/a1 |
204 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
248 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
262 copying d1/d11/a1 to d3/d11/a1 |
318 copying d1/d11/a1 to d3/d11/a1 |
263 removing d1/a |
319 removing d1/a |
264 removing d1/ba |
320 removing d1/ba |
265 removing d1/d11/a1 |
321 removing d1/d11/a1 |
266 A d3/a |
322 A d3/a |
267 A d3/ba |
323 d1/a |
268 A d3/d11/a1 |
324 A d3/ba |
|
325 d1/ba |
|
326 A d3/d11/a1 |
|
327 d1/d11/a1 |
269 R d1/a |
328 R d1/a |
270 R d1/b |
329 R d1/b |
271 R d1/ba |
330 R d1/ba |
272 R d1/d11/a1 |
331 R d1/d11/a1 |
273 4 files updated, 0 files merged, 3 files removed, 0 files unresolved |
332 4 files updated, 0 files merged, 3 files removed, 0 files unresolved |
274 # transitive rename |
333 # transitive rename |
275 A d1/bc |
334 A d1/bc |
|
335 d1/b |
276 R d1/b |
336 R d1/b |
277 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
337 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
278 # transitive rename --after |
338 # transitive rename --after |
279 A d1/bc |
339 A d1/bc |
|
340 d1/b |
280 R d1/b |
341 R d1/b |
281 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
342 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
282 # idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b) |
343 # idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b) |
283 M d1/b |
344 M d1/b |
284 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
345 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |