equal
deleted
inserted
replaced
680 bothdiverge[f] = ic |
680 bothdiverge[f] = ic |
681 for of, fl in bothdiverge.items(): |
681 for of, fl in bothdiverge.items(): |
682 if len(fl) == 2 and fl[0] == fl[1]: |
682 if len(fl) == 2 and fl[0] == fl[1]: |
683 copy[fl[0]] = of # not actually divergent, just matching renames |
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 if fullcopy and repo.ui.debugflag: |
690 if fullcopy and repo.ui.debugflag: |
686 repo.ui.debug(" all copies found (* = to merge, ! = divergent, " |
691 repo.ui.debug(" all copies found (* = to merge, ! = divergent, " |
687 "% = renamed and deleted):\n") |
692 "% = renamed and deleted):\n") |
688 for f in sorted(fullcopy): |
693 for f in sorted(fullcopy): |
689 note = "" |
694 note = "" |