Show More
@@ -687,6 +687,10 b' def _fullcopytracing(repo, c1, c2, base)' | |||||
687 | for dst, src in fullcopy.copy().items(): |
|
687 | for dst, src in fullcopy.copy().items(): | |
688 | if src not in mb: |
|
688 | if src not in mb: | |
689 | del fullcopy[dst] |
|
689 | del fullcopy[dst] | |
|
690 | # Sometimes we forget to add entries from "copy" to "fullcopy", so fix | |||
|
691 | # that up here | |||
|
692 | for dst, src in copy.items(): | |||
|
693 | fullcopy[dst] = src | |||
690 | if fullcopy and repo.ui.debugflag: |
|
694 | if fullcopy and repo.ui.debugflag: | |
691 | repo.ui.debug(" all copies found (* = to merge, ! = divergent, " |
|
695 | repo.ui.debug(" all copies found (* = to merge, ! = divergent, " | |
692 | "% = renamed and deleted):\n") |
|
696 | "% = renamed and deleted):\n") |
@@ -749,6 +749,9 b' Transplants of grafts can find a destina' | |||||
749 | g |
|
749 | g | |
750 | unmatched files new in both: |
|
750 | unmatched files new in both: | |
751 | b |
|
751 | b | |
|
752 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |||
|
753 | src: 'a' -> dst: 'b' * | |||
|
754 | checking for directory renames | |||
752 | resolving manifests |
|
755 | resolving manifests | |
753 | branchmerge: True, force: True, partial: False |
|
756 | branchmerge: True, force: True, partial: False | |
754 | ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87 |
|
757 | ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87 |
@@ -365,6 +365,9 b' args:' | |||||
365 | searching for copies back to rev 1 |
|
365 | searching for copies back to rev 1 | |
366 | unmatched files new in both: |
|
366 | unmatched files new in both: | |
367 | b |
|
367 | b | |
|
368 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |||
|
369 | src: 'a' -> dst: 'b' * | |||
|
370 | checking for directory renames | |||
368 | resolving manifests |
|
371 | resolving manifests | |
369 | branchmerge: True, force: False, partial: False |
|
372 | branchmerge: True, force: False, partial: False | |
370 | ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
|
373 | ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 | |
@@ -952,6 +955,7 b' 8 f (f) f f "remote differs from ' | |||||
952 | 0/f |
|
955 | 0/f | |
953 | 1/g |
|
956 | 1/g | |
954 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
957 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |
|
958 | src: '1/f' -> dst: '1/g' * | |||
955 | src: '3/f' -> dst: '3/g' * |
|
959 | src: '3/f' -> dst: '3/g' * | |
956 | src: '4/f' -> dst: '4/g' * |
|
960 | src: '4/f' -> dst: '4/g' * | |
957 | src: '5/f' -> dst: '5/g' * |
|
961 | src: '5/f' -> dst: '5/g' * |
General Comments 0
You need to be logged in to leave comments.
Login now