Mercurial > hg
comparison tests/test-rename-merge2.out @ 11716:db426935fa94 stable
progress: use gerund (updating) for merge progress
author | timeless <timeless@gmail.com> |
---|---|
date | Fri, 30 Jul 2010 10:32:24 +0300 |
parents | f2618cacb485 |
children |
comparison
equal
deleted
inserted
replaced
11715:4f9dfb54c8b5 | 11716:db426935fa94 |
---|---|
13 ancestor 924404dff337 local e300d1c794ec+ remote 4ce40f5aca24 | 13 ancestor 924404dff337 local e300d1c794ec+ remote 4ce40f5aca24 |
14 rev: versions differ -> m | 14 rev: versions differ -> m |
15 a: remote copied to b -> m | 15 a: remote copied to b -> m |
16 preserving a for resolve of b | 16 preserving a for resolve of b |
17 preserving rev for resolve of rev | 17 preserving rev for resolve of rev |
18 update: a 1/2 files (50.00%) | 18 updating: a 1/2 files (50.00%) |
19 picked tool 'python ../merge' for b (binary False symlink False) | 19 picked tool 'python ../merge' for b (binary False symlink False) |
20 merging a and b to b | 20 merging a and b to b |
21 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 | 21 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
22 premerge successful | 22 premerge successful |
23 update: rev 2/2 files (100.00%) | 23 updating: rev 2/2 files (100.00%) |
24 picked tool 'python ../merge' for rev (binary False symlink False) | 24 picked tool 'python ../merge' for rev (binary False symlink False) |
25 merging rev | 25 merging rev |
26 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | 26 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
27 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 27 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
28 (branch merge, don't forget to commit) | 28 (branch merge, don't forget to commit) |
48 a: remote is newer -> g | 48 a: remote is newer -> g |
49 b: local copied/moved to a -> m | 49 b: local copied/moved to a -> m |
50 rev: versions differ -> m | 50 rev: versions differ -> m |
51 preserving b for resolve of b | 51 preserving b for resolve of b |
52 preserving rev for resolve of rev | 52 preserving rev for resolve of rev |
53 update: a 1/3 files (33.33%) | 53 updating: a 1/3 files (33.33%) |
54 getting a | 54 getting a |
55 update: b 2/3 files (66.67%) | 55 updating: b 2/3 files (66.67%) |
56 picked tool 'python ../merge' for b (binary False symlink False) | 56 picked tool 'python ../merge' for b (binary False symlink False) |
57 merging b and a to b | 57 merging b and a to b |
58 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 | 58 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 |
59 premerge successful | 59 premerge successful |
60 update: rev 3/3 files (100.00%) | 60 updating: rev 3/3 files (100.00%) |
61 picked tool 'python ../merge' for rev (binary False symlink False) | 61 picked tool 'python ../merge' for rev (binary False symlink False) |
62 merging rev | 62 merging rev |
63 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 | 63 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
64 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 64 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
65 (branch merge, don't forget to commit) | 65 (branch merge, don't forget to commit) |
85 rev: versions differ -> m | 85 rev: versions differ -> m |
86 a: remote moved to b -> m | 86 a: remote moved to b -> m |
87 preserving a for resolve of b | 87 preserving a for resolve of b |
88 preserving rev for resolve of rev | 88 preserving rev for resolve of rev |
89 removing a | 89 removing a |
90 update: a 1/2 files (50.00%) | 90 updating: a 1/2 files (50.00%) |
91 picked tool 'python ../merge' for b (binary False symlink False) | 91 picked tool 'python ../merge' for b (binary False symlink False) |
92 merging a and b to b | 92 merging a and b to b |
93 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 | 93 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
94 premerge successful | 94 premerge successful |
95 update: rev 2/2 files (100.00%) | 95 updating: rev 2/2 files (100.00%) |
96 picked tool 'python ../merge' for rev (binary False symlink False) | 96 picked tool 'python ../merge' for rev (binary False symlink False) |
97 merging rev | 97 merging rev |
98 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 | 98 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
99 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 99 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
100 (branch merge, don't forget to commit) | 100 (branch merge, don't forget to commit) |
118 ancestor 924404dff337 local 02963e448370+ remote f4db7e329e71 | 118 ancestor 924404dff337 local 02963e448370+ remote f4db7e329e71 |
119 b: local copied/moved to a -> m | 119 b: local copied/moved to a -> m |
120 rev: versions differ -> m | 120 rev: versions differ -> m |
121 preserving b for resolve of b | 121 preserving b for resolve of b |
122 preserving rev for resolve of rev | 122 preserving rev for resolve of rev |
123 update: b 1/2 files (50.00%) | 123 updating: b 1/2 files (50.00%) |
124 picked tool 'python ../merge' for b (binary False symlink False) | 124 picked tool 'python ../merge' for b (binary False symlink False) |
125 merging b and a to b | 125 merging b and a to b |
126 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 | 126 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 |
127 premerge successful | 127 premerge successful |
128 update: rev 2/2 files (100.00%) | 128 updating: rev 2/2 files (100.00%) |
129 picked tool 'python ../merge' for rev (binary False symlink False) | 129 picked tool 'python ../merge' for rev (binary False symlink False) |
130 merging rev | 130 merging rev |
131 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 | 131 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
132 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 132 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
133 (branch merge, don't forget to commit) | 133 (branch merge, don't forget to commit) |
150 overwrite None partial False | 150 overwrite None partial False |
151 ancestor 924404dff337 local 94b33a1b7f2d+ remote 4ce40f5aca24 | 151 ancestor 924404dff337 local 94b33a1b7f2d+ remote 4ce40f5aca24 |
152 rev: versions differ -> m | 152 rev: versions differ -> m |
153 b: remote created -> g | 153 b: remote created -> g |
154 preserving rev for resolve of rev | 154 preserving rev for resolve of rev |
155 update: b 1/2 files (50.00%) | 155 updating: b 1/2 files (50.00%) |
156 getting b | 156 getting b |
157 update: rev 2/2 files (100.00%) | 157 updating: rev 2/2 files (100.00%) |
158 picked tool 'python ../merge' for rev (binary False symlink False) | 158 picked tool 'python ../merge' for rev (binary False symlink False) |
159 merging rev | 159 merging rev |
160 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | 160 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
161 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 161 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
162 (branch merge, don't forget to commit) | 162 (branch merge, don't forget to commit) |
178 resolving manifests | 178 resolving manifests |
179 overwrite None partial False | 179 overwrite None partial False |
180 ancestor 924404dff337 local 86a2aa42fc76+ remote 97c705ade336 | 180 ancestor 924404dff337 local 86a2aa42fc76+ remote 97c705ade336 |
181 rev: versions differ -> m | 181 rev: versions differ -> m |
182 preserving rev for resolve of rev | 182 preserving rev for resolve of rev |
183 update: rev 1/1 files (100.00%) | 183 updating: rev 1/1 files (100.00%) |
184 picked tool 'python ../merge' for rev (binary False symlink False) | 184 picked tool 'python ../merge' for rev (binary False symlink False) |
185 merging rev | 185 merging rev |
186 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 | 186 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
187 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 187 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
188 (branch merge, don't forget to commit) | 188 (branch merge, don't forget to commit) |
206 ancestor 924404dff337 local 94b33a1b7f2d+ remote bdb19105162a | 206 ancestor 924404dff337 local 94b33a1b7f2d+ remote bdb19105162a |
207 a: other deleted -> r | 207 a: other deleted -> r |
208 rev: versions differ -> m | 208 rev: versions differ -> m |
209 b: remote created -> g | 209 b: remote created -> g |
210 preserving rev for resolve of rev | 210 preserving rev for resolve of rev |
211 update: a 1/3 files (33.33%) | 211 updating: a 1/3 files (33.33%) |
212 removing a | 212 removing a |
213 update: b 2/3 files (66.67%) | 213 updating: b 2/3 files (66.67%) |
214 getting b | 214 getting b |
215 update: rev 3/3 files (100.00%) | 215 updating: rev 3/3 files (100.00%) |
216 picked tool 'python ../merge' for rev (binary False symlink False) | 216 picked tool 'python ../merge' for rev (binary False symlink False) |
217 merging rev | 217 merging rev |
218 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 | 218 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
219 1 files updated, 1 files merged, 1 files removed, 0 files unresolved | 219 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
220 (branch merge, don't forget to commit) | 220 (branch merge, don't forget to commit) |
235 resolving manifests | 235 resolving manifests |
236 overwrite None partial False | 236 overwrite None partial False |
237 ancestor 924404dff337 local 02963e448370+ remote 97c705ade336 | 237 ancestor 924404dff337 local 02963e448370+ remote 97c705ade336 |
238 rev: versions differ -> m | 238 rev: versions differ -> m |
239 preserving rev for resolve of rev | 239 preserving rev for resolve of rev |
240 update: rev 1/1 files (100.00%) | 240 updating: rev 1/1 files (100.00%) |
241 picked tool 'python ../merge' for rev (binary False symlink False) | 241 picked tool 'python ../merge' for rev (binary False symlink False) |
242 merging rev | 242 merging rev |
243 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 | 243 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
244 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 244 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
245 (branch merge, don't forget to commit) | 245 (branch merge, don't forget to commit) |
257 ancestor 924404dff337 local 62e7bf090eba+ remote 49b6d8032493 | 257 ancestor 924404dff337 local 62e7bf090eba+ remote 49b6d8032493 |
258 b: versions differ -> m | 258 b: versions differ -> m |
259 rev: versions differ -> m | 259 rev: versions differ -> m |
260 preserving b for resolve of b | 260 preserving b for resolve of b |
261 preserving rev for resolve of rev | 261 preserving rev for resolve of rev |
262 update: b 1/2 files (50.00%) | 262 updating: b 1/2 files (50.00%) |
263 picked tool 'python ../merge' for b (binary False symlink False) | 263 picked tool 'python ../merge' for b (binary False symlink False) |
264 merging b | 264 merging b |
265 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 | 265 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
266 update: rev 2/2 files (100.00%) | 266 updating: rev 2/2 files (100.00%) |
267 picked tool 'python ../merge' for rev (binary False symlink False) | 267 picked tool 'python ../merge' for rev (binary False symlink False) |
268 merging rev | 268 merging rev |
269 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 | 269 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
270 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 270 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
271 (branch merge, don't forget to commit) | 271 (branch merge, don't forget to commit) |
291 overwrite None partial False | 291 overwrite None partial False |
292 ancestor 924404dff337 local 02963e448370+ remote fe905ef2c33e | 292 ancestor 924404dff337 local 02963e448370+ remote fe905ef2c33e |
293 rev: versions differ -> m | 293 rev: versions differ -> m |
294 c: remote created -> g | 294 c: remote created -> g |
295 preserving rev for resolve of rev | 295 preserving rev for resolve of rev |
296 update: a 1/3 files (33.33%) | 296 updating: a 1/3 files (33.33%) |
297 warning: detected divergent renames of a to: | 297 warning: detected divergent renames of a to: |
298 b | 298 b |
299 c | 299 c |
300 update: c 2/3 files (66.67%) | 300 updating: c 2/3 files (66.67%) |
301 getting c | 301 getting c |
302 update: rev 3/3 files (100.00%) | 302 updating: rev 3/3 files (100.00%) |
303 picked tool 'python ../merge' for rev (binary False symlink False) | 303 picked tool 'python ../merge' for rev (binary False symlink False) |
304 merging rev | 304 merging rev |
305 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 | 305 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
306 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 306 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
307 (branch merge, don't forget to commit) | 307 (branch merge, don't forget to commit) |
320 ancestor 924404dff337 local 86a2aa42fc76+ remote af30c7647fc7 | 320 ancestor 924404dff337 local 86a2aa42fc76+ remote af30c7647fc7 |
321 b: versions differ -> m | 321 b: versions differ -> m |
322 rev: versions differ -> m | 322 rev: versions differ -> m |
323 preserving b for resolve of b | 323 preserving b for resolve of b |
324 preserving rev for resolve of rev | 324 preserving rev for resolve of rev |
325 update: b 1/2 files (50.00%) | 325 updating: b 1/2 files (50.00%) |
326 picked tool 'python ../merge' for b (binary False symlink False) | 326 picked tool 'python ../merge' for b (binary False symlink False) |
327 merging b | 327 merging b |
328 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 | 328 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
329 update: rev 2/2 files (100.00%) | 329 updating: rev 2/2 files (100.00%) |
330 picked tool 'python ../merge' for rev (binary False symlink False) | 330 picked tool 'python ../merge' for rev (binary False symlink False) |
331 merging rev | 331 merging rev |
332 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 | 332 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
333 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 333 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
334 (branch merge, don't forget to commit) | 334 (branch merge, don't forget to commit) |
348 a: other deleted -> r | 348 a: other deleted -> r |
349 b: versions differ -> m | 349 b: versions differ -> m |
350 rev: versions differ -> m | 350 rev: versions differ -> m |
351 preserving b for resolve of b | 351 preserving b for resolve of b |
352 preserving rev for resolve of rev | 352 preserving rev for resolve of rev |
353 update: a 1/3 files (33.33%) | 353 updating: a 1/3 files (33.33%) |
354 removing a | 354 removing a |
355 update: b 2/3 files (66.67%) | 355 updating: b 2/3 files (66.67%) |
356 picked tool 'python ../merge' for b (binary False symlink False) | 356 picked tool 'python ../merge' for b (binary False symlink False) |
357 merging b | 357 merging b |
358 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | 358 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
359 update: rev 3/3 files (100.00%) | 359 updating: rev 3/3 files (100.00%) |
360 picked tool 'python ../merge' for rev (binary False symlink False) | 360 picked tool 'python ../merge' for rev (binary False symlink False) |
361 merging rev | 361 merging rev |
362 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | 362 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
363 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | 363 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
364 (branch merge, don't forget to commit) | 364 (branch merge, don't forget to commit) |
377 a: remote is newer -> g | 377 a: remote is newer -> g |
378 b: versions differ -> m | 378 b: versions differ -> m |
379 rev: versions differ -> m | 379 rev: versions differ -> m |
380 preserving b for resolve of b | 380 preserving b for resolve of b |
381 preserving rev for resolve of rev | 381 preserving rev for resolve of rev |
382 update: a 1/3 files (33.33%) | 382 updating: a 1/3 files (33.33%) |
383 getting a | 383 getting a |
384 update: b 2/3 files (66.67%) | 384 updating: b 2/3 files (66.67%) |
385 picked tool 'python ../merge' for b (binary False symlink False) | 385 picked tool 'python ../merge' for b (binary False symlink False) |
386 merging b | 386 merging b |
387 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | 387 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
388 update: rev 3/3 files (100.00%) | 388 updating: rev 3/3 files (100.00%) |
389 picked tool 'python ../merge' for rev (binary False symlink False) | 389 picked tool 'python ../merge' for rev (binary False symlink False) |
390 merging rev | 390 merging rev |
391 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | 391 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
392 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 392 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
393 (branch merge, don't forget to commit) | 393 (branch merge, don't forget to commit) |
407 a: other deleted -> r | 407 a: other deleted -> r |
408 b: versions differ -> m | 408 b: versions differ -> m |
409 rev: versions differ -> m | 409 rev: versions differ -> m |
410 preserving b for resolve of b | 410 preserving b for resolve of b |
411 preserving rev for resolve of rev | 411 preserving rev for resolve of rev |
412 update: a 1/3 files (33.33%) | 412 updating: a 1/3 files (33.33%) |
413 removing a | 413 removing a |
414 update: b 2/3 files (66.67%) | 414 updating: b 2/3 files (66.67%) |
415 picked tool 'python ../merge' for b (binary False symlink False) | 415 picked tool 'python ../merge' for b (binary False symlink False) |
416 merging b | 416 merging b |
417 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | 417 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
418 update: rev 3/3 files (100.00%) | 418 updating: rev 3/3 files (100.00%) |
419 picked tool 'python ../merge' for rev (binary False symlink False) | 419 picked tool 'python ../merge' for rev (binary False symlink False) |
420 merging rev | 420 merging rev |
421 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | 421 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
422 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | 422 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
423 (branch merge, don't forget to commit) | 423 (branch merge, don't forget to commit) |
436 a: remote is newer -> g | 436 a: remote is newer -> g |
437 b: versions differ -> m | 437 b: versions differ -> m |
438 rev: versions differ -> m | 438 rev: versions differ -> m |
439 preserving b for resolve of b | 439 preserving b for resolve of b |
440 preserving rev for resolve of rev | 440 preserving rev for resolve of rev |
441 update: a 1/3 files (33.33%) | 441 updating: a 1/3 files (33.33%) |
442 getting a | 442 getting a |
443 update: b 2/3 files (66.67%) | 443 updating: b 2/3 files (66.67%) |
444 picked tool 'python ../merge' for b (binary False symlink False) | 444 picked tool 'python ../merge' for b (binary False symlink False) |
445 merging b | 445 merging b |
446 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | 446 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
447 update: rev 3/3 files (100.00%) | 447 updating: rev 3/3 files (100.00%) |
448 picked tool 'python ../merge' for rev (binary False symlink False) | 448 picked tool 'python ../merge' for rev (binary False symlink False) |
449 merging rev | 449 merging rev |
450 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | 450 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
451 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 451 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
452 (branch merge, don't forget to commit) | 452 (branch merge, don't forget to commit) |
465 ancestor 924404dff337 local 0b76e65c8289+ remote 4ce40f5aca24 | 465 ancestor 924404dff337 local 0b76e65c8289+ remote 4ce40f5aca24 |
466 b: versions differ -> m | 466 b: versions differ -> m |
467 rev: versions differ -> m | 467 rev: versions differ -> m |
468 preserving b for resolve of b | 468 preserving b for resolve of b |
469 preserving rev for resolve of rev | 469 preserving rev for resolve of rev |
470 update: b 1/2 files (50.00%) | 470 updating: b 1/2 files (50.00%) |
471 picked tool 'python ../merge' for b (binary False symlink False) | 471 picked tool 'python ../merge' for b (binary False symlink False) |
472 merging b | 472 merging b |
473 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 | 473 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
474 update: rev 2/2 files (100.00%) | 474 updating: rev 2/2 files (100.00%) |
475 picked tool 'python ../merge' for rev (binary False symlink False) | 475 picked tool 'python ../merge' for rev (binary False symlink False) |
476 merging rev | 476 merging rev |
477 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | 477 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
478 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 478 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
479 (branch merge, don't forget to commit) | 479 (branch merge, don't forget to commit) |
495 remote changed a which local deleted | 495 remote changed a which local deleted |
496 use (c)hanged version or leave (d)eleted? c | 496 use (c)hanged version or leave (d)eleted? c |
497 a: prompt recreating -> g | 497 a: prompt recreating -> g |
498 preserving b for resolve of b | 498 preserving b for resolve of b |
499 preserving rev for resolve of rev | 499 preserving rev for resolve of rev |
500 update: a 1/3 files (33.33%) | 500 updating: a 1/3 files (33.33%) |
501 getting a | 501 getting a |
502 update: b 2/3 files (66.67%) | 502 updating: b 2/3 files (66.67%) |
503 picked tool 'python ../merge' for b (binary False symlink False) | 503 picked tool 'python ../merge' for b (binary False symlink False) |
504 merging b | 504 merging b |
505 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 | 505 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
506 update: rev 3/3 files (100.00%) | 506 updating: rev 3/3 files (100.00%) |
507 picked tool 'python ../merge' for rev (binary False symlink False) | 507 picked tool 'python ../merge' for rev (binary False symlink False) |
508 merging rev | 508 merging rev |
509 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 | 509 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
510 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 510 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
511 (branch merge, don't forget to commit) | 511 (branch merge, don't forget to commit) |
527 a: prompt keep -> a | 527 a: prompt keep -> a |
528 b: versions differ -> m | 528 b: versions differ -> m |
529 rev: versions differ -> m | 529 rev: versions differ -> m |
530 preserving b for resolve of b | 530 preserving b for resolve of b |
531 preserving rev for resolve of rev | 531 preserving rev for resolve of rev |
532 update: a 1/3 files (33.33%) | 532 updating: a 1/3 files (33.33%) |
533 update: b 2/3 files (66.67%) | 533 updating: b 2/3 files (66.67%) |
534 picked tool 'python ../merge' for b (binary False symlink False) | 534 picked tool 'python ../merge' for b (binary False symlink False) |
535 merging b | 535 merging b |
536 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 | 536 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
537 update: rev 3/3 files (100.00%) | 537 updating: rev 3/3 files (100.00%) |
538 picked tool 'python ../merge' for rev (binary False symlink False) | 538 picked tool 'python ../merge' for rev (binary False symlink False) |
539 merging rev | 539 merging rev |
540 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 | 540 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
541 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 541 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
542 (branch merge, don't forget to commit) | 542 (branch merge, don't forget to commit) |
561 rev: versions differ -> m | 561 rev: versions differ -> m |
562 a: remote moved to b -> m | 562 a: remote moved to b -> m |
563 preserving a for resolve of b | 563 preserving a for resolve of b |
564 preserving rev for resolve of rev | 564 preserving rev for resolve of rev |
565 removing a | 565 removing a |
566 update: a 1/2 files (50.00%) | 566 updating: a 1/2 files (50.00%) |
567 picked tool 'python ../merge' for b (binary False symlink False) | 567 picked tool 'python ../merge' for b (binary False symlink False) |
568 merging a and b to b | 568 merging a and b to b |
569 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 | 569 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
570 update: rev 2/2 files (100.00%) | 570 updating: rev 2/2 files (100.00%) |
571 picked tool 'python ../merge' for rev (binary False symlink False) | 571 picked tool 'python ../merge' for rev (binary False symlink False) |
572 merging rev | 572 merging rev |
573 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 | 573 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
574 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 574 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
575 (branch merge, don't forget to commit) | 575 (branch merge, don't forget to commit) |
593 ancestor 924404dff337 local 62e7bf090eba+ remote f4db7e329e71 | 593 ancestor 924404dff337 local 62e7bf090eba+ remote f4db7e329e71 |
594 b: local copied/moved to a -> m | 594 b: local copied/moved to a -> m |
595 rev: versions differ -> m | 595 rev: versions differ -> m |
596 preserving b for resolve of b | 596 preserving b for resolve of b |
597 preserving rev for resolve of rev | 597 preserving rev for resolve of rev |
598 update: b 1/2 files (50.00%) | 598 updating: b 1/2 files (50.00%) |
599 picked tool 'python ../merge' for b (binary False symlink False) | 599 picked tool 'python ../merge' for b (binary False symlink False) |
600 merging b and a to b | 600 merging b and a to b |
601 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 | 601 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
602 update: rev 2/2 files (100.00%) | 602 updating: rev 2/2 files (100.00%) |
603 picked tool 'python ../merge' for rev (binary False symlink False) | 603 picked tool 'python ../merge' for rev (binary False symlink False) |
604 merging rev | 604 merging rev |
605 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 | 605 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
606 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 606 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
607 (branch merge, don't forget to commit) | 607 (branch merge, don't forget to commit) |
628 b: local copied/moved to a -> m | 628 b: local copied/moved to a -> m |
629 rev: versions differ -> m | 629 rev: versions differ -> m |
630 c: remote created -> g | 630 c: remote created -> g |
631 preserving b for resolve of b | 631 preserving b for resolve of b |
632 preserving rev for resolve of rev | 632 preserving rev for resolve of rev |
633 update: b 1/3 files (33.33%) | 633 updating: b 1/3 files (33.33%) |
634 picked tool 'python ../merge' for b (binary False symlink False) | 634 picked tool 'python ../merge' for b (binary False symlink False) |
635 merging b and a to b | 635 merging b and a to b |
636 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 | 636 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 |
637 premerge successful | 637 premerge successful |
638 update: c 2/3 files (66.67%) | 638 updating: c 2/3 files (66.67%) |
639 getting c | 639 getting c |
640 update: rev 3/3 files (100.00%) | 640 updating: rev 3/3 files (100.00%) |
641 picked tool 'python ../merge' for rev (binary False symlink False) | 641 picked tool 'python ../merge' for rev (binary False symlink False) |
642 merging rev | 642 merging rev |
643 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 | 643 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
644 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 644 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
645 (branch merge, don't forget to commit) | 645 (branch merge, don't forget to commit) |