Show More
@@ -696,7 +696,11 def _fullcopytracing(repo, c1, c2, base) | |||
|
696 | 696 | for src, dsts in diverge.items(): |
|
697 | 697 | for dst in dsts: |
|
698 | 698 | fullcopy[dst] = src |
|
699 | if fullcopy and repo.ui.debugflag: | |
|
699 | ||
|
700 | if not fullcopy: | |
|
701 | return copy, {}, diverge, renamedelete, {} | |
|
702 | ||
|
703 | if repo.ui.debugflag: | |
|
700 | 704 | repo.ui.debug(" all copies found (* = to merge, ! = divergent, " |
|
701 | 705 | "% = renamed and deleted):\n") |
|
702 | 706 | for f in sorted(fullcopy): |
@@ -711,9 +715,6 def _fullcopytracing(repo, c1, c2, base) | |||
|
711 | 715 | note)) |
|
712 | 716 | del divergeset |
|
713 | 717 | |
|
714 | if not fullcopy: | |
|
715 | return copy, {}, diverge, renamedelete, {} | |
|
716 | ||
|
717 | 718 | repo.ui.debug(" checking for directory renames\n") |
|
718 | 719 | |
|
719 | 720 | # generate a directory move map |
General Comments 0
You need to be logged in to leave comments.
Login now