Mercurial > hg

comparison tests/test-rename-merge2.t @ 18605:bcf29565d89f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manifestmerge: pass in branchmerge and force separately This will be used in an upcoming patch.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 08 Feb 2013 15:23:23 +0000
parents c8ba98bf0e71
children e2dc5397bc82
comparison
equal deleted inserted replaced
18604:a1141f04e368 18605:bcf29565d89f
82 b 82 b
83 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 83 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
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 branchmerge: True, force: False, partial: False
88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24
89 a: remote copied to b -> m 89 a: remote copied to b -> m
90 preserving a for resolve of b 90 preserving a for resolve of b
91 rev: versions differ -> m 91 rev: versions differ -> m
92 preserving rev for resolve of rev 92 preserving rev for resolve of rev
117 b 117 b
118 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 118 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
119 src: 'a' -> dst: 'b' * 119 src: 'a' -> dst: 'b' *
120 checking for directory renames 120 checking for directory renames
121 resolving manifests 121 resolving manifests
122 overwrite: False, partial: False 122 branchmerge: True, force: 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 preserving b for resolve of b 126 preserving b for resolve of b
127 rev: versions differ -> m 127 rev: versions differ -> m
155 b 155 b
156 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 156 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
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 branchmerge: True, force: False, partial: False
161 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a 161 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a
162 a: remote moved to b -> m 162 a: remote moved to b -> m
163 preserving a for resolve of b 163 preserving a for resolve of b
164 rev: versions differ -> m 164 rev: versions differ -> m
165 preserving rev for resolve of rev 165 preserving rev for resolve of rev
190 b 190 b
191 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 191 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
192 src: 'a' -> dst: 'b' * 192 src: 'a' -> dst: 'b' *
193 checking for directory renames 193 checking for directory renames
194 resolving manifests 194 resolving manifests
195 overwrite: False, partial: False 195 branchmerge: True, force: 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 preserving b for resolve of b 198 preserving b for resolve of b
199 rev: versions differ -> m 199 rev: versions differ -> m
200 preserving rev for resolve of rev 200 preserving rev for resolve of rev
224 b 224 b
225 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 225 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
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 branchmerge: True, force: False, partial: False
230 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 230 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24
231 b: remote created -> g 231 b: remote created -> g
232 rev: versions differ -> m 232 rev: versions differ -> m
233 preserving rev for resolve of rev 233 preserving rev for resolve of rev
234 updating: b 1/2 files (50.00%) 234 updating: b 1/2 files (50.00%)
254 b 254 b
255 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 255 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
256 src: 'a' -> dst: 'b' 256 src: 'a' -> dst: 'b'
257 checking for directory renames 257 checking for directory renames
258 resolving manifests 258 resolving manifests
259 overwrite: False, partial: False 259 branchmerge: True, force: 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)
281 b 281 b
282 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 282 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
283 src: 'a' -> dst: 'b' 283 src: 'a' -> dst: 'b'
284 checking for directory renames 284 checking for directory renames
285 resolving manifests 285 resolving manifests
286 overwrite: False, partial: False 286 branchmerge: True, force: 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 b: remote created -> g 289 b: remote created -> g
290 rev: versions differ -> m 290 rev: versions differ -> m
291 preserving rev for resolve of rev 291 preserving rev for resolve of rev
313 b 313 b
314 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 314 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
315 src: 'a' -> dst: 'b' 315 src: 'a' -> dst: 'b'
316 checking for directory renames 316 checking for directory renames
317 resolving manifests 317 resolving manifests
318 overwrite: False, partial: False 318 branchmerge: True, force: 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)
334 -------------- 334 --------------
335 test L:um a b R:um a b W: - 9 do merge with ancestor in a 335 test L:um a b R:um a b W: - 9 do merge with ancestor in a
336 -------------- 336 --------------
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 branchmerge: True, force: 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 preserving b for resolve of b 342 preserving b for resolve of b
343 rev: versions differ -> m 343 rev: versions differ -> m
344 preserving rev for resolve of rev 344 preserving rev for resolve of rev
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 376 resolving manifests
377 overwrite: False, partial: False 377 branchmerge: True, force: False, partial: False
378 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e 378 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e
379 a: divergent renames -> dr 379 a: divergent renames -> dr
380 c: remote created -> g 380 c: remote created -> g
381 rev: versions differ -> m 381 rev: versions differ -> m
382 preserving rev for resolve of rev 382 preserving rev for resolve of rev
402 -------------- 402 --------------
403 test L:nc a b R:up b W: - 12 merge b no ancestor 403 test L:nc a b R:up b W: - 12 merge b no ancestor
404 -------------- 404 --------------
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 branchmerge: True, force: 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 preserving b for resolve of b 410 preserving b for resolve of b
411 rev: versions differ -> m 411 rev: versions differ -> m
412 preserving rev for resolve of rev 412 preserving rev for resolve of rev
430 -------------- 430 --------------
431 test L:up b R:nm a b W: - 13 merge b no ancestor 431 test L:up b R:nm a b W: - 13 merge b no ancestor
432 -------------- 432 --------------
433 searching for copies back to rev 1 433 searching for copies back to rev 1
434 resolving manifests 434 resolving manifests
435 overwrite: False, partial: False 435 branchmerge: True, force: 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 preserving b for resolve of b 439 preserving b for resolve of b
440 rev: versions differ -> m 440 rev: versions differ -> m
460 -------------- 460 --------------
461 test L:nc a b R:up a b W: - 14 merge b no ancestor 461 test L:nc a b R:up a b W: - 14 merge b no ancestor
462 -------------- 462 --------------
463 searching for copies back to rev 1 463 searching for copies back to rev 1
464 resolving manifests 464 resolving manifests
465 overwrite: False, partial: False 465 branchmerge: True, force: 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 preserving b for resolve of b 469 preserving b for resolve of b
470 rev: versions differ -> m 470 rev: versions differ -> m
491 -------------- 491 --------------
492 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a 492 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a
493 -------------- 493 --------------
494 searching for copies back to rev 1 494 searching for copies back to rev 1
495 resolving manifests 495 resolving manifests
496 overwrite: False, partial: False 496 branchmerge: True, force: 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 preserving b for resolve of b 500 preserving b for resolve of b
501 rev: versions differ -> m 501 rev: versions differ -> m
521 -------------- 521 --------------
522 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor 522 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
523 -------------- 523 --------------
524 searching for copies back to rev 1 524 searching for copies back to rev 1
525 resolving manifests 525 resolving manifests
526 overwrite: False, partial: False 526 branchmerge: True, force: 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 preserving b for resolve of b 530 preserving b for resolve of b
531 rev: versions differ -> m 531 rev: versions differ -> m
552 -------------- 552 --------------
553 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor 553 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
554 -------------- 554 --------------
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 branchmerge: True, force: 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 preserving b for resolve of b 560 preserving b for resolve of b
561 rev: versions differ -> m 561 rev: versions differ -> m
562 preserving rev for resolve of rev 562 preserving rev for resolve of rev
580 -------------- 580 --------------
581 test L:nm a b R:up a b W: - 18 merge b no ancestor 581 test L:nm a b R:up a b W: - 18 merge b no ancestor
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 branchmerge: True, force: False, partial: False
586 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a 586 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
587 remote changed a which local deleted 587 remote changed a which local deleted
588 use (c)hanged version or leave (d)eleted? c 588 use (c)hanged version or leave (d)eleted? c
589 a: prompt recreating -> g 589 a: prompt recreating -> g
590 b: versions differ -> m 590 b: versions differ -> m
613 -------------- 613 --------------
614 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a 614 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
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 branchmerge: True, force: False, partial: False
619 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a 619 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
620 local changed a which remote deleted 620 local changed a which remote deleted
621 use (c)hanged version or (d)elete? c 621 use (c)hanged version or (d)elete? c
622 a: prompt keep -> a 622 a: prompt keep -> a
623 b: versions differ -> m 623 b: versions differ -> m
650 b 650 b
651 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 651 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
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 branchmerge: True, force: False, partial: False
656 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 656 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493
657 a: remote moved to b -> m 657 a: remote moved to b -> m
658 preserving a for resolve of b 658 preserving a for resolve of b
659 rev: versions differ -> m 659 rev: versions differ -> m
660 preserving rev for resolve of rev 660 preserving rev for resolve of rev
684 b 684 b
685 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 685 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
686 src: 'a' -> dst: 'b' * 686 src: 'a' -> dst: 'b' *
687 checking for directory renames 687 checking for directory renames
688 resolving manifests 688 resolving manifests
689 overwrite: False, partial: False 689 branchmerge: True, force: 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 preserving b for resolve of b 692 preserving b for resolve of b
693 rev: versions differ -> m 693 rev: versions differ -> m
694 preserving rev for resolve of rev 694 preserving rev for resolve of rev
722 c 722 c
723 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 723 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
724 src: 'a' -> dst: 'b' * 724 src: 'a' -> dst: 'b' *
725 checking for directory renames 725 checking for directory renames
726 resolving manifests 726 resolving manifests
727 overwrite: False, partial: False 727 branchmerge: True, force: 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 preserving b for resolve of b 730 preserving b for resolve of b
731 c: remote created -> g 731 c: remote created -> g
732 rev: versions differ -> m 732 rev: versions differ -> m