Show More
@@ -682,6 +682,11 b' def _fullcopytracing(repo, c1, c2, base)' | |||
|
682 | 682 | if len(fl) == 2 and fl[0] == fl[1]: |
|
683 | 683 | copy[fl[0]] = of # not actually divergent, just matching renames |
|
684 | 684 | |
|
685 | # Sometimes we get invalid copies here (the "and not remotebase" in | |
|
686 | # _checkcopies() seems suspicious). Filter them out. | |
|
687 | for dst, src in fullcopy.copy().items(): | |
|
688 | if src not in mb: | |
|
689 | del fullcopy[dst] | |
|
685 | 690 | if fullcopy and repo.ui.debugflag: |
|
686 | 691 | repo.ui.debug(" all copies found (* = to merge, ! = divergent, " |
|
687 | 692 | "% = renamed and deleted):\n") |
@@ -423,17 +423,10 b' Verify that the old context ancestor wor' | |||
|
423 | 423 | d1/b |
|
424 | 424 | unmatched files in other: |
|
425 | 425 | d2/b |
|
426 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
|
427 | src: 'd1/b' -> dst: 'd2/b' | |
|
428 | checking for directory renames | |
|
429 | discovered dir src: 'd1/' -> dst: 'd2/' | |
|
430 | pending file src: 'd1/a' -> dst: 'd2/a' | |
|
431 | pending file src: 'd1/b' -> dst: 'd2/b' | |
|
432 | 426 | resolving manifests |
|
433 | 427 | branchmerge: True, force: False, partial: False |
|
434 | 428 | ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9 |
|
435 | d2/a: remote directory rename - move from d1/a -> dm | |
|
436 | d2/b: remote directory rename, both created -> m | |
|
429 | d2/b: remote created -> g | |
|
437 | 430 | |
|
438 | 431 | calculating bids for ancestor 154e6000f54e |
|
439 | 432 | searching for copies back to rev 3 |
@@ -453,8 +446,7 b' Verify that the old context ancestor wor' | |||
|
453 | 446 | auction for merging merge bids |
|
454 | 447 | d1/a: consensus for r |
|
455 | 448 | d1/b: consensus for r |
|
456 |
d2/ |
|
|
457 | d2/b: picking 'get' action | |
|
449 | d2/b: consensus for g | |
|
458 | 450 | end of auction |
|
459 | 451 | |
|
460 | 452 | d1/a: other deleted -> r |
General Comments 0
You need to be logged in to leave comments.
Login now