Mercurial > hg
comparison mercurial/copies.py @ 42169:a68036b849b0
copies: delete debug message about "unmatched files new in both"
Same reasoning as previous patch.
Differential Revision: https://phab.mercurial-scm.org/D6251
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 15 Apr 2019 14:09:18 -0700 |
| parents | 341bddf88ac5 |
| children | 390ec72b8ea4 |
comparison
equal
deleted
inserted
replaced
| 42168:341bddf88ac5 | 42169:a68036b849b0 |
|---|---|
| 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': {}, |