equal
deleted
inserted
replaced
623 renamedelete[of] = [f for f in fl if f in c1 or f in c2] |
623 renamedelete[of] = [f for f in fl if f in c1 or f in c2] |
624 renamedeleteset.update(fl) # reverse map for below |
624 renamedeleteset.update(fl) # reverse map for below |
625 else: |
625 else: |
626 divergeset.update(fl) # reverse map for below |
626 divergeset.update(fl) # reverse map for below |
627 |
627 |
628 if bothnew: |
|
629 repo.ui.debug(" unmatched files new in both:\n %s\n" |
|
630 % "\n ".join(bothnew)) |
|
631 bothdiverge = {} |
628 bothdiverge = {} |
632 bothincompletediverge = {} |
629 bothincompletediverge = {} |
633 remainder = {} |
630 remainder = {} |
634 both1 = {'copy': {}, |
631 both1 = {'copy': {}, |
635 'fullcopy': {}, |
632 'fullcopy': {}, |