equal
deleted
inserted
replaced
172 repo.ui.debug(_(" all copies found (* = to merge, ! = divergent):\n")) |
172 repo.ui.debug(_(" all copies found (* = to merge, ! = divergent):\n")) |
173 for f in fullcopy: |
173 for f in fullcopy: |
174 note = "" |
174 note = "" |
175 if f in copy: note += "*" |
175 if f in copy: note += "*" |
176 if f in diverge2: note += "!" |
176 if f in diverge2: note += "!" |
177 repo.ui.debug(_(" %s -> %s %s\n") % (f, fullcopy[f], note)) |
177 repo.ui.debug(" %s -> %s %s\n" % (f, fullcopy[f], note)) |
178 del diverge2 |
178 del diverge2 |
179 |
179 |
180 if not fullcopy or not checkdirs: |
180 if not fullcopy or not checkdirs: |
181 return copy, diverge |
181 return copy, diverge |
182 |
182 |