Mercurial > hg

comparison tests/test-rename.out @ 2175:b2ae81a7df29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make hg update more verbose by default (issue12) (including small changes to revert and backout to not show these stats with the exception of backout --merge) Show update stats (unless -q), e.g.: K files updated, L files merged, M files removed, N files unresolved Inform the user what to do after a merge: (branch merge, don't forget to commit) Inform the user what to do if a branch merge failed: There are unresolved merges, you can redo the full merge using: hg update -C X hg merge Y Inform the user what to do if a working directory merge failed: There are unresolved merges with locally modified files.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 02 May 2006 18:44:02 +0200
parents df8416346bb7
children 36abb07c79d4
comparison
equal deleted inserted replaced
2174:3044a3fdae76 2175:b2ae81a7df29
1 # rename a single file 1 # rename a single file
2 A d2/c 2 A d2/c
3 R d1/d11/a1 3 R d1/d11/a1
4 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
4 # rename --after a single file 5 # rename --after a single file
5 A d2/c 6 A d2/c
6 R d1/d11/a1 7 R d1/d11/a1
8 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
7 # move a single file to an existing directory 9 # move a single file to an existing directory
8 A d2/a1 10 A d2/a1
9 R d1/d11/a1 11 R d1/d11/a1
12 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
10 # move --after a single file to an existing directory 13 # move --after a single file to an existing directory
11 A d2/a1 14 A d2/a1
12 R d1/d11/a1 15 R d1/d11/a1
16 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
13 # rename a file using a relative path 17 # rename a file using a relative path
14 A d1/d11/e 18 A d1/d11/e
15 R d2/b 19 R d2/b
20 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
16 # rename --after a file using a relative path 21 # rename --after a file using a relative path
17 A d1/d11/e 22 A d1/d11/e
18 R d2/b 23 R d2/b
24 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
19 # rename directory d1 as d3 25 # rename directory d1 as d3
20 copying d1/a to d3/a 26 copying d1/a to d3/a
21 copying d1/b to d3/b 27 copying d1/b to d3/b
22 copying d1/ba to d3/ba 28 copying d1/ba to d3/ba
23 copying d1/d11/a1 to d3/d11/a1 29 copying d1/d11/a1 to d3/d11/a1
31 A d3/d11/a1 37 A d3/d11/a1
32 R d1/a 38 R d1/a
33 R d1/b 39 R d1/b
34 R d1/ba 40 R d1/ba
35 R d1/d11/a1 41 R d1/d11/a1
42 4 files updated, 0 files merged, 4 files removed, 0 files unresolved
36 # rename --after directory d1 as d3 43 # rename --after directory d1 as d3
37 copying d1/a to d3/a 44 copying d1/a to d3/a
38 copying d1/b to d3/b 45 copying d1/b to d3/b
39 copying d1/ba to d3/ba 46 copying d1/ba to d3/ba
40 copying d1/d11/a1 to d3/d11/a1 47 copying d1/d11/a1 to d3/d11/a1
48 A d3/d11/a1 55 A d3/d11/a1
49 R d1/a 56 R d1/a
50 R d1/b 57 R d1/b
51 R d1/ba 58 R d1/ba
52 R d1/d11/a1 59 R d1/d11/a1
60 4 files updated, 0 files merged, 4 files removed, 0 files unresolved
53 # move a directory using a relative path 61 # move a directory using a relative path
54 copying ../d1/d11/a1 to d3/d11/a1 62 copying ../d1/d11/a1 to d3/d11/a1
55 removing ../d1/d11/a1 63 removing ../d1/d11/a1
56 A d2/d3/d11/a1 64 A d2/d3/d11/a1
57 R d1/d11/a1 65 R d1/d11/a1
66 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
58 # move --after a directory using a relative path 67 # move --after a directory using a relative path
59 copying ../d1/d11/a1 to d3/d11/a1 68 copying ../d1/d11/a1 to d3/d11/a1
60 removing ../d1/d11/a1 69 removing ../d1/d11/a1
61 A d2/d3/d11/a1 70 A d2/d3/d11/a1
62 R d1/d11/a1 71 R d1/d11/a1
72 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
63 # move directory d1/d11 to an existing directory d2 (removes empty d1) 73 # move directory d1/d11 to an existing directory d2 (removes empty d1)
64 copying d1/d11/a1 to d2/d11/a1 74 copying d1/d11/a1 to d2/d11/a1
65 removing d1/d11/a1 75 removing d1/d11/a1
66 A d2/d11/a1 76 A d2/d11/a1
67 R d1/d11/a1 77 R d1/d11/a1
78 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
68 # move directories d1 and d2 to a new directory d3 79 # move directories d1 and d2 to a new directory d3
69 copying d1/a to d3/d1/a 80 copying d1/a to d3/d1/a
70 copying d1/b to d3/d1/b 81 copying d1/b to d3/d1/b
71 copying d1/ba to d3/d1/ba 82 copying d1/ba to d3/d1/ba
72 copying d1/d11/a1 to d3/d1/d11/a1 83 copying d1/d11/a1 to d3/d1/d11/a1
84 R d1/a 95 R d1/a
85 R d1/b 96 R d1/b
86 R d1/ba 97 R d1/ba
87 R d1/d11/a1 98 R d1/d11/a1
88 R d2/b 99 R d2/b
100 5 files updated, 0 files merged, 5 files removed, 0 files unresolved
89 # move --after directories d1 and d2 to a new directory d3 101 # move --after directories d1 and d2 to a new directory d3
90 copying d1/a to d3/d1/a 102 copying d1/a to d3/d1/a
91 copying d1/b to d3/d1/b 103 copying d1/b to d3/d1/b
92 copying d1/ba to d3/d1/ba 104 copying d1/ba to d3/d1/ba
93 copying d1/d11/a1 to d3/d1/d11/a1 105 copying d1/d11/a1 to d3/d1/d11/a1
105 R d1/a 117 R d1/a
106 R d1/b 118 R d1/b
107 R d1/ba 119 R d1/ba
108 R d1/d11/a1 120 R d1/d11/a1
109 R d2/b 121 R d2/b
122 5 files updated, 0 files merged, 5 files removed, 0 files unresolved
110 # move everything under directory d1 to existing directory d2, do not 123 # move everything under directory d1 to existing directory d2, do not
111 # overwrite existing files (d2/b) 124 # overwrite existing files (d2/b)
112 d2/b: not overwriting - file exists 125 d2/b: not overwriting - file exists
113 copying d1/d11/a1 to d2/d11/a1 126 copying d1/d11/a1 to d2/d11/a1
114 removing d1/d11/a1 127 removing d1/d11/a1
120 R d1/d11/a1 133 R d1/d11/a1
121 1c1 134 1c1
122 < d1/b 135 < d1/b
123 --- 136 ---
124 > d2/b 137 > d2/b
138 3 files updated, 0 files merged, 3 files removed, 0 files unresolved
125 # attempt to move potentially more than one file into a non-existent 139 # attempt to move potentially more than one file into a non-existent
126 # directory 140 # directory
127 abort: with multiple sources, destination must be an existing directory 141 abort: with multiple sources, destination must be an existing directory
128 # move every file under d1 to d2/d21 (glob) 142 # move every file under d1 to d2/d21 (glob)
129 copying d1/a to d2/d21/a 143 copying d1/a to d2/d21/a
140 A d2/d21/ba 154 A d2/d21/ba
141 R d1/a 155 R d1/a
142 R d1/b 156 R d1/b
143 R d1/ba 157 R d1/ba
144 R d1/d11/a1 158 R d1/d11/a1
159 4 files updated, 0 files merged, 4 files removed, 0 files unresolved
145 # move --after some files under d1 to d2/d21 (glob) 160 # move --after some files under d1 to d2/d21 (glob)
146 copying d1/a to d2/d21/a 161 copying d1/a to d2/d21/a
147 copying d1/d11/a1 to d2/d21/a1 162 copying d1/d11/a1 to d2/d21/a1
148 removing d1/a 163 removing d1/a
149 removing d1/d11/a1 164 removing d1/d11/a1
150 A d2/d21/a 165 A d2/d21/a
151 A d2/d21/a1 166 A d2/d21/a1
152 R d1/a 167 R d1/a
153 R d1/d11/a1 168 R d1/d11/a1
169 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
154 # move every file under d1 starting with an 'a' to d2/d21 (regexp) 170 # move every file under d1 starting with an 'a' to d2/d21 (regexp)
155 copying d1/a to d2/d21/a 171 copying d1/a to d2/d21/a
156 copying d1/d11/a1 to d2/d21/a1 172 copying d1/d11/a1 to d2/d21/a1
157 removing d1/a 173 removing d1/a
158 removing d1/d11/a1 174 removing d1/d11/a1
159 A d2/d21/a 175 A d2/d21/a
160 A d2/d21/a1 176 A d2/d21/a1
161 R d1/a 177 R d1/a
162 R d1/d11/a1 178 R d1/d11/a1
179 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
163 # attempt to overwrite an existing file 180 # attempt to overwrite an existing file
164 d1/ca: not overwriting - file exists 181 d1/ca: not overwriting - file exists
165 ? d1/ca 182 ? d1/ca
183 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
166 # forced overwrite of an existing file 184 # forced overwrite of an existing file
167 A d1/ca 185 A d1/ca
168 R d1/ba 186 R d1/ba
187 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
169 # replace a symlink with a file 188 # replace a symlink with a file
170 A d1/ca 189 A d1/ca
171 R d1/ba 190 R d1/ba
191 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
172 # do not copy more than one source file to the same destination file 192 # do not copy more than one source file to the same destination file
173 copying d1/d11/a1 to d3/d11/a1 193 copying d1/d11/a1 to d3/d11/a1
174 d3/b: not overwriting - d2/b collides with d1/b 194 d3/b: not overwriting - d2/b collides with d1/b
175 removing d1/d11/a1 195 removing d1/d11/a1
176 A d3/a 196 A d3/a
179 A d3/d11/a1 199 A d3/d11/a1
180 R d1/a 200 R d1/a
181 R d1/b 201 R d1/b
182 R d1/ba 202 R d1/ba
183 R d1/d11/a1 203 R d1/d11/a1
204 4 files updated, 0 files merged, 4 files removed, 0 files unresolved
184 # move a whole subtree with "hg rename ." 205 # move a whole subtree with "hg rename ."
185 copying a to ../d3/d1/a 206 copying a to ../d3/d1/a
186 copying b to ../d3/d1/b 207 copying b to ../d3/d1/b
187 copying ba to ../d3/d1/ba 208 copying ba to ../d3/d1/ba
188 copying d11/a1 to ../d3/d1/d11/a1 209 copying d11/a1 to ../d3/d1/d11/a1
196 A d3/d1/d11/a1 217 A d3/d1/d11/a1
197 R d1/a 218 R d1/a
198 R d1/b 219 R d1/b
199 R d1/ba 220 R d1/ba
200 R d1/d11/a1 221 R d1/d11/a1
222 4 files updated, 0 files merged, 4 files removed, 0 files unresolved
201 # move a whole subtree with "hg rename --after ." 223 # move a whole subtree with "hg rename --after ."
202 copying a to ../d3/a 224 copying a to ../d3/a
203 copying b to ../d3/b 225 copying b to ../d3/b
204 copying ba to ../d3/ba 226 copying ba to ../d3/ba
205 copying d11/a1 to ../d3/d11/a1 227 copying d11/a1 to ../d3/d11/a1
213 A d3/d11/a1 235 A d3/d11/a1
214 R d1/a 236 R d1/a
215 R d1/b 237 R d1/b
216 R d1/ba 238 R d1/ba
217 R d1/d11/a1 239 R d1/d11/a1
240 4 files updated, 0 files merged, 4 files removed, 0 files unresolved
218 # move the parent tree with "hg rename .." 241 # move the parent tree with "hg rename .."
219 copying ../a to ../../d3/a 242 copying ../a to ../../d3/a
220 copying ../b to ../../d3/b 243 copying ../b to ../../d3/b
221 copying ../ba to ../../d3/ba 244 copying ../ba to ../../d3/ba
222 copying a1 to ../../d3/d11/a1 245 copying a1 to ../../d3/d11/a1
230 A d3/d11/a1 253 A d3/d11/a1
231 R d1/a 254 R d1/a
232 R d1/b 255 R d1/b
233 R d1/ba 256 R d1/ba
234 R d1/d11/a1 257 R d1/d11/a1
258 4 files updated, 0 files merged, 4 files removed, 0 files unresolved
235 # skip removed files 259 # skip removed files
236 copying d1/a to d3/a 260 copying d1/a to d3/a
237 copying d1/ba to d3/ba 261 copying d1/ba to d3/ba
238 copying d1/d11/a1 to d3/d11/a1 262 copying d1/d11/a1 to d3/d11/a1
239 removing d1/a 263 removing d1/a
244 A d3/d11/a1 268 A d3/d11/a1
245 R d1/a 269 R d1/a
246 R d1/b 270 R d1/b
247 R d1/ba 271 R d1/ba
248 R d1/d11/a1 272 R d1/d11/a1
273 4 files updated, 0 files merged, 3 files removed, 0 files unresolved
249 # transitive rename 274 # transitive rename
250 A d1/bc 275 A d1/bc
251 R d1/b 276 R d1/b
277 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
252 # transitive rename --after 278 # transitive rename --after
253 A d1/bc 279 A d1/bc
254 R d1/b 280 R d1/b
281 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
255 # idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b) 282 # idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b)
256 M d1/b 283 M d1/b
284 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
257 # check illegal path components 285 # check illegal path components
258 abort: path contains illegal component: .hg/foo 286 abort: path contains illegal component: .hg/foo
259 287
260 abort: ../foo not under root 288 abort: ../foo not under root
261 abort: path contains illegal component: .hg/foo 289 abort: path contains illegal component: .hg/foo
262 290
263 ! d1/d11/a1 291 ! d1/d11/a1
292 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
264 abort: path contains illegal component: .hg/a1 293 abort: path contains illegal component: .hg/a1
265 294
266 abort: ../a1 not under root 295 abort: ../a1 not under root
267 abort: path contains illegal component: .hg/a1 296 abort: path contains illegal component: .hg/a1
268 297
269 ! d1/d11/a1 298 ! d1/d11/a1
299 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
270 abort: path contains illegal component: .hg/foo 300 abort: path contains illegal component: .hg/foo
271 301
272 abort: ../../../foo not under root 302 abort: ../../../foo not under root