1 # rename a single file |
1 # rename a single file |
2 A d2/c |
2 A d2/c |
3 d1/d11/a1 |
3 d1/d11/a1 |
4 R d1/d11/a1 |
4 R d1/d11/a1 |
5 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6 # rename --after a single file |
6 # rename --after a single file |
7 A d2/c |
7 A d2/c |
8 d1/d11/a1 |
8 d1/d11/a1 |
9 R d1/d11/a1 |
9 R d1/d11/a1 |
10 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11 # move a single file to an existing directory |
11 # move a single file to an existing directory |
12 A d2/a1 |
12 A d2/a1 |
13 d1/d11/a1 |
13 d1/d11/a1 |
14 R d1/d11/a1 |
14 R d1/d11/a1 |
15 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
16 # move --after a single file to an existing directory |
16 # move --after a single file to an existing directory |
17 A d2/a1 |
17 A d2/a1 |
18 d1/d11/a1 |
18 d1/d11/a1 |
19 R d1/d11/a1 |
19 R d1/d11/a1 |
20 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21 # rename a file using a relative path |
21 # rename a file using a relative path |
22 A d1/d11/e |
22 A d1/d11/e |
23 d2/b |
23 d2/b |
24 R d2/b |
24 R d2/b |
25 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
25 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
26 # rename --after a file using a relative path |
26 # rename --after a file using a relative path |
27 A d1/d11/e |
27 A d1/d11/e |
28 d2/b |
28 d2/b |
29 R d2/b |
29 R d2/b |
30 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
30 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
31 # rename directory d1 as d3 |
31 # rename directory d1 as d3 |
32 moving d1/a to d3/a |
32 moving d1/a to d3/a |
33 moving d1/b to d3/b |
33 moving d1/b to d3/b |
34 moving d1/ba to d3/ba |
34 moving d1/ba to d3/ba |
35 moving d1/d11/a1 to d3/d11/a1 |
35 moving d1/d11/a1 to d3/d11/a1 |
61 d1/d11/a1 |
61 d1/d11/a1 |
62 R d1/a |
62 R d1/a |
63 R d1/b |
63 R d1/b |
64 R d1/ba |
64 R d1/ba |
65 R d1/d11/a1 |
65 R d1/d11/a1 |
66 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
66 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
67 # move a directory using a relative path |
67 # move a directory using a relative path |
68 moving ../d1/d11/a1 to d3/d11/a1 |
68 moving ../d1/d11/a1 to d3/d11/a1 |
69 A d2/d3/d11/a1 |
69 A d2/d3/d11/a1 |
70 d1/d11/a1 |
70 d1/d11/a1 |
71 R d1/d11/a1 |
71 R d1/d11/a1 |
72 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
72 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
73 # move --after a directory using a relative path |
73 # move --after a directory using a relative path |
74 moving ../d1/d11/a1 to d3/d11/a1 |
74 moving ../d1/d11/a1 to d3/d11/a1 |
75 A d2/d3/d11/a1 |
75 A d2/d3/d11/a1 |
76 d1/d11/a1 |
76 d1/d11/a1 |
77 R d1/d11/a1 |
77 R d1/d11/a1 |
78 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
78 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
79 # move directory d1/d11 to an existing directory d2 (removes empty d1) |
79 # move directory d1/d11 to an existing directory d2 (removes empty d1) |
80 moving d1/d11/a1 to d2/d11/a1 |
80 moving d1/d11/a1 to d2/d11/a1 |
81 A d2/d11/a1 |
81 A d2/d11/a1 |
82 d1/d11/a1 |
82 d1/d11/a1 |
83 R d1/d11/a1 |
83 R d1/d11/a1 |
84 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
84 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
85 # move directories d1 and d2 to a new directory d3 |
85 # move directories d1 and d2 to a new directory d3 |
86 moving d1/a to d3/d1/a |
86 moving d1/a to d3/d1/a |
87 moving d1/b to d3/d1/b |
87 moving d1/b to d3/d1/b |
88 moving d1/ba to d3/d1/ba |
88 moving d1/ba to d3/d1/ba |
89 moving d1/d11/a1 to d3/d1/d11/a1 |
89 moving d1/d11/a1 to d3/d1/d11/a1 |
101 R d1/a |
101 R d1/a |
102 R d1/b |
102 R d1/b |
103 R d1/ba |
103 R d1/ba |
104 R d1/d11/a1 |
104 R d1/d11/a1 |
105 R d2/b |
105 R d2/b |
106 5 files updated, 0 files merged, 5 files removed, 0 files unresolved |
106 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
107 # move --after directories d1 and d2 to a new directory d3 |
107 # move --after directories d1 and d2 to a new directory d3 |
108 moving d1/a to d3/d1/a |
108 moving d1/a to d3/d1/a |
109 moving d1/b to d3/d1/b |
109 moving d1/b to d3/d1/b |
110 moving d1/ba to d3/d1/ba |
110 moving d1/ba to d3/d1/ba |
111 moving d1/d11/a1 to d3/d1/d11/a1 |
111 moving d1/d11/a1 to d3/d1/d11/a1 |
123 R d1/a |
123 R d1/a |
124 R d1/b |
124 R d1/b |
125 R d1/ba |
125 R d1/ba |
126 R d1/d11/a1 |
126 R d1/d11/a1 |
127 R d2/b |
127 R d2/b |
128 5 files updated, 0 files merged, 5 files removed, 0 files unresolved |
128 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
129 # move everything under directory d1 to existing directory d2, do not |
129 # move everything under directory d1 to existing directory d2, do not |
130 # overwrite existing files (d2/b) |
130 # overwrite existing files (d2/b) |
131 d2/b: not overwriting - file exists |
131 d2/b: not overwriting - file exists |
132 moving d1/d11/a1 to d2/d11/a1 |
132 moving d1/d11/a1 to d2/d11/a1 |
133 A d2/a |
133 A d2/a |
141 R d1/d11/a1 |
141 R d1/d11/a1 |
142 1c1 |
142 1c1 |
143 < d1/b |
143 < d1/b |
144 --- |
144 --- |
145 > d2/b |
145 > d2/b |
146 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
146 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
147 # attempt to move one file into a non-existent directory |
147 # attempt to move one file into a non-existent directory |
148 abort: destination dx/ is not a directory |
148 abort: destination dx/ is not a directory |
149 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
150 # attempt to move potentially more than one file into a non-existent |
150 # attempt to move potentially more than one file into a non-existent |
151 # directory |
151 # directory |
165 d1/ba |
165 d1/ba |
166 R d1/a |
166 R d1/a |
167 R d1/b |
167 R d1/b |
168 R d1/ba |
168 R d1/ba |
169 R d1/d11/a1 |
169 R d1/d11/a1 |
170 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
170 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
171 # move --after some files under d1 to d2/d21 (glob) |
171 # move --after some files under d1 to d2/d21 (glob) |
172 moving d1/a to d2/d21/a |
172 moving d1/a to d2/d21/a |
173 moving d1/d11/a1 to d2/d21/a1 |
173 moving d1/d11/a1 to d2/d21/a1 |
174 A d2/d21/a |
174 A d2/d21/a |
175 d1/a |
175 d1/a |
176 A d2/d21/a1 |
176 A d2/d21/a1 |
177 d1/d11/a1 |
177 d1/d11/a1 |
178 R d1/a |
178 R d1/a |
179 R d1/d11/a1 |
179 R d1/d11/a1 |
180 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
180 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
181 # move every file under d1 starting with an 'a' to d2/d21 (regexp) |
181 # move every file under d1 starting with an 'a' to d2/d21 (regexp) |
182 moving d1/a to d2/d21/a |
182 moving d1/a to d2/d21/a |
183 moving d1/d11/a1 to d2/d21/a1 |
183 moving d1/d11/a1 to d2/d21/a1 |
184 A d2/d21/a |
184 A d2/d21/a |
185 d1/a |
185 d1/a |
186 A d2/d21/a1 |
186 A d2/d21/a1 |
187 d1/d11/a1 |
187 d1/d11/a1 |
188 R d1/a |
188 R d1/a |
189 R d1/d11/a1 |
189 R d1/d11/a1 |
190 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
190 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
191 # attempt to overwrite an existing file |
191 # attempt to overwrite an existing file |
192 d1/ca: not overwriting - file exists |
192 d1/ca: not overwriting - file exists |
193 ? d1/ca |
193 ? d1/ca |
194 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
194 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
195 # forced overwrite of an existing file |
195 # forced overwrite of an existing file |
196 A d1/ca |
196 A d1/ca |
197 d1/ba |
197 d1/ba |
198 R d1/ba |
198 R d1/ba |
199 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
199 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
200 # replace a symlink with a file |
200 # replace a symlink with a file |
201 A d1/ca |
201 A d1/ca |
202 d1/ba |
202 d1/ba |
203 R d1/ba |
203 R d1/ba |
204 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
204 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
205 # do not copy more than one source file to the same destination file |
205 # do not copy more than one source file to the same destination file |
206 moving d1/d11/a1 to d3/d11/a1 |
206 moving d1/d11/a1 to d3/d11/a1 |
207 d3/b: not overwriting - d2/b collides with d1/b |
207 d3/b: not overwriting - d2/b collides with d1/b |
208 A d3/a |
208 A d3/a |
209 d1/a |
209 d1/a |
215 d1/d11/a1 |
215 d1/d11/a1 |
216 R d1/a |
216 R d1/a |
217 R d1/b |
217 R d1/b |
218 R d1/ba |
218 R d1/ba |
219 R d1/d11/a1 |
219 R d1/d11/a1 |
220 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
220 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
221 # move a whole subtree with "hg rename ." |
221 # move a whole subtree with "hg rename ." |
222 moving a to ../d3/d1/a |
222 moving a to ../d3/d1/a |
223 moving b to ../d3/d1/b |
223 moving b to ../d3/d1/b |
224 moving ba to ../d3/d1/ba |
224 moving ba to ../d3/d1/ba |
225 moving d11/a1 to ../d3/d1/d11/a1 |
225 moving d11/a1 to ../d3/d1/d11/a1 |
251 d1/d11/a1 |
251 d1/d11/a1 |
252 R d1/a |
252 R d1/a |
253 R d1/b |
253 R d1/b |
254 R d1/ba |
254 R d1/ba |
255 R d1/d11/a1 |
255 R d1/d11/a1 |
256 4 files updated, 0 files merged, 4 files removed, 0 files unresolved |
256 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
257 # move the parent tree with "hg rename .." |
257 # move the parent tree with "hg rename .." |
258 moving ../a to ../../d3/a |
258 moving ../a to ../../d3/a |
259 moving ../b to ../../d3/b |
259 moving ../b to ../../d3/b |
260 moving ../ba to ../../d3/ba |
260 moving ../ba to ../../d3/ba |
261 moving a1 to ../../d3/d11/a1 |
261 moving a1 to ../../d3/d11/a1 |
284 d1/d11/a1 |
284 d1/d11/a1 |
285 R d1/a |
285 R d1/a |
286 R d1/b |
286 R d1/b |
287 R d1/ba |
287 R d1/ba |
288 R d1/d11/a1 |
288 R d1/d11/a1 |
289 4 files updated, 0 files merged, 3 files removed, 0 files unresolved |
289 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
290 # transitive rename |
290 # transitive rename |
291 A d1/bc |
291 A d1/bc |
292 d1/b |
292 d1/b |
293 R d1/b |
293 R d1/b |
294 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
294 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
295 # transitive rename --after |
295 # transitive rename --after |
296 A d1/bc |
296 A d1/bc |
297 d1/b |
297 d1/b |
298 R d1/b |
298 R d1/b |
299 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
299 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
300 # idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b) |
300 # idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b) |
301 M d1/b |
301 M d1/b |
302 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
302 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
303 # check illegal path components |
303 # check illegal path components |
304 abort: path contains illegal component: .hg/foo |
304 abort: path contains illegal component: .hg/foo |