Mercurial > hg

comparison tests/test-rename-merge2.t @ 18541:5ed6a375e9ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: delay debug messages for merge actions Show messages at a point where the actions have been sorted, thus preparing for backout of 760c0d67ce5e. This makes manifestmerge more of a silent operation, just like 'copies' is. Indent 'preserving' messages to make them subordinate to the action logging so they fit in the new context. (The 'preserving' messages are quite redundant and could also be removed completely.)
author Mads Kiilerich <madski@unity3d.com>
date Thu, 24 Jan 2013 23:57:44 +0100
parents cf25e4efd685
children c8ba98bf0e71
comparison
equal deleted inserted replaced
18540:139529b0a191 18541:5ed6a375e9ca
84 src: 'a' -> dst: 'b' * 84 src: 'a' -> dst: 'b' *
85 checking for directory renames 85 checking for directory renames
86 resolving manifests 86 resolving manifests
87 overwrite: False, partial: False 87 overwrite: False, partial: False
88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24
89 rev: versions differ -> m
90 a: remote copied to b -> m 89 a: remote copied to b -> m
91 preserving a for resolve of b 90 preserving a for resolve of b
92 preserving rev for resolve of rev 91 rev: versions differ -> m
92 preserving rev for resolve of rev
93 updating: a 1/2 files (50.00%) 93 updating: a 1/2 files (50.00%)
94 picked tool 'python ../merge' for b (binary False symlink False) 94 picked tool 'python ../merge' for b (binary False symlink False)
95 merging a and b to b 95 merging a and b to b
96 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 96 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337
97 premerge successful 97 premerge successful
121 resolving manifests 121 resolving manifests
122 overwrite: False, partial: False 122 overwrite: False, partial: False
123 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 123 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71
124 a: remote is newer -> g 124 a: remote is newer -> g
125 b: local copied/moved to a -> m 125 b: local copied/moved to a -> m
126 rev: versions differ -> m 126 preserving b for resolve of b
127 preserving b for resolve of b 127 rev: versions differ -> m
128 preserving rev for resolve of rev 128 preserving rev for resolve of rev
129 updating: a 1/3 files (33.33%) 129 updating: a 1/3 files (33.33%)
130 getting a 130 getting a
131 updating: b 2/3 files (66.67%) 131 updating: b 2/3 files (66.67%)
132 picked tool 'python ../merge' for b (binary False symlink False) 132 picked tool 'python ../merge' for b (binary False symlink False)
133 merging b and a to b 133 merging b and a to b
157 src: 'a' -> dst: 'b' * 157 src: 'a' -> dst: 'b' *
158 checking for directory renames 158 checking for directory renames
159 resolving manifests 159 resolving manifests
160 overwrite: False, partial: False 160 overwrite: False, partial: False
161 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a 161 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a
162 rev: versions differ -> m
163 a: remote moved to b -> m 162 a: remote moved to b -> m
164 preserving a for resolve of b 163 preserving a for resolve of b
165 preserving rev for resolve of rev 164 rev: versions differ -> m
165 preserving rev for resolve of rev
166 removing a 166 removing a
167 updating: a 1/2 files (50.00%) 167 updating: a 1/2 files (50.00%)
168 picked tool 'python ../merge' for b (binary False symlink False) 168 picked tool 'python ../merge' for b (binary False symlink False)
169 merging a and b to b 169 merging a and b to b
170 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 170 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337
193 checking for directory renames 193 checking for directory renames
194 resolving manifests 194 resolving manifests
195 overwrite: False, partial: False 195 overwrite: False, partial: False
196 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 196 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71
197 b: local copied/moved to a -> m 197 b: local copied/moved to a -> m
198 rev: versions differ -> m 198 preserving b for resolve of b
199 preserving b for resolve of b 199 rev: versions differ -> m
200 preserving rev for resolve of rev 200 preserving rev for resolve of rev
201 updating: b 1/2 files (50.00%) 201 updating: b 1/2 files (50.00%)
202 picked tool 'python ../merge' for b (binary False symlink False) 202 picked tool 'python ../merge' for b (binary False symlink False)
203 merging b and a to b 203 merging b and a to b
204 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 204 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337
205 premerge successful 205 premerge successful
226 src: 'a' -> dst: 'b' 226 src: 'a' -> dst: 'b'
227 checking for directory renames 227 checking for directory renames
228 resolving manifests 228 resolving manifests
229 overwrite: False, partial: False 229 overwrite: False, partial: False
230 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 230 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24
231 rev: versions differ -> m
232 b: remote created -> g 231 b: remote created -> g
233 preserving rev for resolve of rev 232 rev: versions differ -> m
233 preserving rev for resolve of rev
234 updating: b 1/2 files (50.00%) 234 updating: b 1/2 files (50.00%)
235 getting b 235 getting b
236 updating: rev 2/2 files (100.00%) 236 updating: rev 2/2 files (100.00%)
237 picked tool 'python ../merge' for rev (binary False symlink False) 237 picked tool 'python ../merge' for rev (binary False symlink False)
238 merging rev 238 merging rev
257 checking for directory renames 257 checking for directory renames
258 resolving manifests 258 resolving manifests
259 overwrite: False, partial: False 259 overwrite: False, partial: False
260 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 260 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
261 rev: versions differ -> m 261 rev: versions differ -> m
262 preserving rev for resolve of rev 262 preserving rev for resolve of rev
263 updating: rev 1/1 files (100.00%) 263 updating: rev 1/1 files (100.00%)
264 picked tool 'python ../merge' for rev (binary False symlink False) 264 picked tool 'python ../merge' for rev (binary False symlink False)
265 merging rev 265 merging rev
266 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 266 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
267 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 267 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
284 checking for directory renames 284 checking for directory renames
285 resolving manifests 285 resolving manifests
286 overwrite: False, partial: False 286 overwrite: False, partial: False
287 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a 287 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a
288 a: other deleted -> r 288 a: other deleted -> r
289 rev: versions differ -> m
290 b: remote created -> g 289 b: remote created -> g
291 preserving rev for resolve of rev 290 rev: versions differ -> m
291 preserving rev for resolve of rev
292 updating: a 1/3 files (33.33%) 292 updating: a 1/3 files (33.33%)
293 removing a 293 removing a
294 updating: b 2/3 files (66.67%) 294 updating: b 2/3 files (66.67%)
295 getting b 295 getting b
296 updating: rev 3/3 files (100.00%) 296 updating: rev 3/3 files (100.00%)
316 checking for directory renames 316 checking for directory renames
317 resolving manifests 317 resolving manifests
318 overwrite: False, partial: False 318 overwrite: False, partial: False
319 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 319 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
320 rev: versions differ -> m 320 rev: versions differ -> m
321 preserving rev for resolve of rev 321 preserving rev for resolve of rev
322 updating: rev 1/1 files (100.00%) 322 updating: rev 1/1 files (100.00%)
323 picked tool 'python ../merge' for rev (binary False symlink False) 323 picked tool 'python ../merge' for rev (binary False symlink False)
324 merging rev 324 merging rev
325 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 325 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
326 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 326 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
337 searching for copies back to rev 1 337 searching for copies back to rev 1
338 resolving manifests 338 resolving manifests
339 overwrite: False, partial: False 339 overwrite: False, partial: False
340 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 340 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493
341 b: versions differ -> m 341 b: versions differ -> m
342 rev: versions differ -> m 342 preserving b for resolve of b
343 preserving b for resolve of b 343 rev: versions differ -> m
344 preserving rev for resolve of rev 344 preserving rev for resolve of rev
345 updating: b 1/2 files (50.00%) 345 updating: b 1/2 files (50.00%)
346 picked tool 'python ../merge' for b (binary False symlink False) 346 picked tool 'python ../merge' for b (binary False symlink False)
347 merging b 347 merging b
348 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 348 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
349 updating: rev 2/2 files (100.00%) 349 updating: rev 2/2 files (100.00%)
371 c 371 c
372 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 372 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
373 src: 'a' -> dst: 'b' ! 373 src: 'a' -> dst: 'b' !
374 src: 'a' -> dst: 'c' ! 374 src: 'a' -> dst: 'c' !
375 checking for directory renames 375 checking for directory renames
376 resolving manifests
377 overwrite: False, partial: False
378 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e
376 a: divergent renames -> dr 379 a: divergent renames -> dr
377 resolving manifests
378 overwrite: False, partial: False
379 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e
380 rev: versions differ -> m
381 c: remote created -> g 380 c: remote created -> g
382 preserving rev for resolve of rev 381 rev: versions differ -> m
382 preserving rev for resolve of rev
383 updating: a 1/3 files (33.33%) 383 updating: a 1/3 files (33.33%)
384 note: possible conflict - a was renamed multiple times to: 384 note: possible conflict - a was renamed multiple times to:
385 b 385 b
386 c 386 c
387 updating: c 2/3 files (66.67%) 387 updating: c 2/3 files (66.67%)
405 searching for copies back to rev 1 405 searching for copies back to rev 1
406 resolving manifests 406 resolving manifests
407 overwrite: False, partial: False 407 overwrite: False, partial: False
408 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 408 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
409 b: versions differ -> m 409 b: versions differ -> m
410 rev: versions differ -> m 410 preserving b for resolve of b
411 preserving b for resolve of b 411 rev: versions differ -> m
412 preserving rev for resolve of rev 412 preserving rev for resolve of rev
413 updating: b 1/2 files (50.00%) 413 updating: b 1/2 files (50.00%)
414 picked tool 'python ../merge' for b (binary False symlink False) 414 picked tool 'python ../merge' for b (binary False symlink False)
415 merging b 415 merging b
416 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 416 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
417 updating: rev 2/2 files (100.00%) 417 updating: rev 2/2 files (100.00%)
434 resolving manifests 434 resolving manifests
435 overwrite: False, partial: False 435 overwrite: False, partial: False
436 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a 436 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
437 a: other deleted -> r 437 a: other deleted -> r
438 b: versions differ -> m 438 b: versions differ -> m
439 rev: versions differ -> m 439 preserving b for resolve of b
440 preserving b for resolve of b 440 rev: versions differ -> m
441 preserving rev for resolve of rev 441 preserving rev for resolve of rev
442 updating: a 1/3 files (33.33%) 442 updating: a 1/3 files (33.33%)
443 removing a 443 removing a
444 updating: b 2/3 files (66.67%) 444 updating: b 2/3 files (66.67%)
445 picked tool 'python ../merge' for b (binary False symlink False) 445 picked tool 'python ../merge' for b (binary False symlink False)
446 merging b 446 merging b
464 resolving manifests 464 resolving manifests
465 overwrite: False, partial: False 465 overwrite: False, partial: False
466 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a 466 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
467 a: remote is newer -> g 467 a: remote is newer -> g
468 b: versions differ -> m 468 b: versions differ -> m
469 rev: versions differ -> m 469 preserving b for resolve of b
470 preserving b for resolve of b 470 rev: versions differ -> m
471 preserving rev for resolve of rev 471 preserving rev for resolve of rev
472 updating: a 1/3 files (33.33%) 472 updating: a 1/3 files (33.33%)
473 getting a 473 getting a
474 updating: b 2/3 files (66.67%) 474 updating: b 2/3 files (66.67%)
475 picked tool 'python ../merge' for b (binary False symlink False) 475 picked tool 'python ../merge' for b (binary False symlink False)
476 merging b 476 merging b
495 resolving manifests 495 resolving manifests
496 overwrite: False, partial: False 496 overwrite: False, partial: False
497 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a 497 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
498 a: other deleted -> r 498 a: other deleted -> r
499 b: versions differ -> m 499 b: versions differ -> m
500 rev: versions differ -> m 500 preserving b for resolve of b
501 preserving b for resolve of b 501 rev: versions differ -> m
502 preserving rev for resolve of rev 502 preserving rev for resolve of rev
503 updating: a 1/3 files (33.33%) 503 updating: a 1/3 files (33.33%)
504 removing a 504 removing a
505 updating: b 2/3 files (66.67%) 505 updating: b 2/3 files (66.67%)
506 picked tool 'python ../merge' for b (binary False symlink False) 506 picked tool 'python ../merge' for b (binary False symlink False)
507 merging b 507 merging b
525 resolving manifests 525 resolving manifests
526 overwrite: False, partial: False 526 overwrite: False, partial: False
527 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a 527 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
528 a: remote is newer -> g 528 a: remote is newer -> g
529 b: versions differ -> m 529 b: versions differ -> m
530 rev: versions differ -> m 530 preserving b for resolve of b
531 preserving b for resolve of b 531 rev: versions differ -> m
532 preserving rev for resolve of rev 532 preserving rev for resolve of rev
533 updating: a 1/3 files (33.33%) 533 updating: a 1/3 files (33.33%)
534 getting a 534 getting a
535 updating: b 2/3 files (66.67%) 535 updating: b 2/3 files (66.67%)
536 picked tool 'python ../merge' for b (binary False symlink False) 536 picked tool 'python ../merge' for b (binary False symlink False)
537 merging b 537 merging b
555 searching for copies back to rev 1 555 searching for copies back to rev 1
556 resolving manifests 556 resolving manifests
557 overwrite: False, partial: False 557 overwrite: False, partial: False
558 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 558 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
559 b: versions differ -> m 559 b: versions differ -> m
560 rev: versions differ -> m 560 preserving b for resolve of b
561 preserving b for resolve of b 561 rev: versions differ -> m
562 preserving rev for resolve of rev 562 preserving rev for resolve of rev
563 updating: b 1/2 files (50.00%) 563 updating: b 1/2 files (50.00%)
564 picked tool 'python ../merge' for b (binary False symlink False) 564 picked tool 'python ../merge' for b (binary False symlink False)
565 merging b 565 merging b
566 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 566 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
567 updating: rev 2/2 files (100.00%) 567 updating: rev 2/2 files (100.00%)
582 -------------- 582 --------------
583 searching for copies back to rev 1 583 searching for copies back to rev 1
584 resolving manifests 584 resolving manifests
585 overwrite: False, partial: False 585 overwrite: False, partial: False
586 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a 586 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
587 b: versions differ -> m
588 rev: versions differ -> m
589 remote changed a which local deleted 587 remote changed a which local deleted
590 use (c)hanged version or leave (d)eleted? c 588 use (c)hanged version or leave (d)eleted? c
591 a: prompt recreating -> g 589 a: prompt recreating -> g
592 preserving b for resolve of b 590 b: versions differ -> m
593 preserving rev for resolve of rev 591 preserving b for resolve of b
592 rev: versions differ -> m
593 preserving rev for resolve of rev
594 updating: a 1/3 files (33.33%) 594 updating: a 1/3 files (33.33%)
595 getting a 595 getting a
596 updating: b 2/3 files (66.67%) 596 updating: b 2/3 files (66.67%)
597 picked tool 'python ../merge' for b (binary False symlink False) 597 picked tool 'python ../merge' for b (binary False symlink False)
598 merging b 598 merging b
615 -------------- 615 --------------
616 searching for copies back to rev 1 616 searching for copies back to rev 1
617 resolving manifests 617 resolving manifests
618 overwrite: False, partial: False 618 overwrite: False, partial: False
619 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a 619 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
620 b: versions differ -> m
621 rev: versions differ -> m
622 local changed a which remote deleted 620 local changed a which remote deleted
623 use (c)hanged version or (d)elete? c 621 use (c)hanged version or (d)elete? c
624 a: prompt keep -> a 622 a: prompt keep -> a
625 preserving b for resolve of b 623 b: versions differ -> m
626 preserving rev for resolve of rev 624 preserving b for resolve of b
625 rev: versions differ -> m
626 preserving rev for resolve of rev
627 updating: a 1/3 files (33.33%) 627 updating: a 1/3 files (33.33%)
628 updating: b 2/3 files (66.67%) 628 updating: b 2/3 files (66.67%)
629 picked tool 'python ../merge' for b (binary False symlink False) 629 picked tool 'python ../merge' for b (binary False symlink False)
630 merging b 630 merging b
631 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 631 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
652 src: 'a' -> dst: 'b' * 652 src: 'a' -> dst: 'b' *
653 checking for directory renames 653 checking for directory renames
654 resolving manifests 654 resolving manifests
655 overwrite: False, partial: False 655 overwrite: False, partial: False
656 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 656 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493
657 rev: versions differ -> m
658 a: remote moved to b -> m 657 a: remote moved to b -> m
659 preserving a for resolve of b 658 preserving a for resolve of b
660 preserving rev for resolve of rev 659 rev: versions differ -> m
660 preserving rev for resolve of rev
661 removing a 661 removing a
662 updating: a 1/2 files (50.00%) 662 updating: a 1/2 files (50.00%)
663 picked tool 'python ../merge' for b (binary False symlink False) 663 picked tool 'python ../merge' for b (binary False symlink False)
664 merging a and b to b 664 merging a and b to b
665 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 665 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
687 checking for directory renames 687 checking for directory renames
688 resolving manifests 688 resolving manifests
689 overwrite: False, partial: False 689 overwrite: False, partial: False
690 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 690 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71
691 b: local copied/moved to a -> m 691 b: local copied/moved to a -> m
692 rev: versions differ -> m 692 preserving b for resolve of b
693 preserving b for resolve of b 693 rev: versions differ -> m
694 preserving rev for resolve of rev 694 preserving rev for resolve of rev
695 updating: b 1/2 files (50.00%) 695 updating: b 1/2 files (50.00%)
696 picked tool 'python ../merge' for b (binary False symlink False) 696 picked tool 'python ../merge' for b (binary False symlink False)
697 merging b and a to b 697 merging b and a to b
698 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 698 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
699 updating: rev 2/2 files (100.00%) 699 updating: rev 2/2 files (100.00%)
725 checking for directory renames 725 checking for directory renames
726 resolving manifests 726 resolving manifests
727 overwrite: False, partial: False 727 overwrite: False, partial: False
728 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f 728 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f
729 b: local copied/moved to a -> m 729 b: local copied/moved to a -> m
730 rev: versions differ -> m 730 preserving b for resolve of b
731 c: remote created -> g 731 c: remote created -> g
732 preserving b for resolve of b 732 rev: versions differ -> m
733 preserving rev for resolve of rev 733 preserving rev for resolve of rev
734 updating: b 1/3 files (33.33%) 734 updating: b 1/3 files (33.33%)
735 picked tool 'python ../merge' for b (binary False symlink False) 735 picked tool 'python ../merge' for b (binary False symlink False)
736 merging b and a to b 736 merging b and a to b
737 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 737 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
738 premerge successful 738 premerge successful