Mercurial > hg-stable
comparison mercurial/merge.py @ 15625:efdcce3fd2d5
merge: make debug output easier to read
I always found it hard to figure out what the debug code meant without
the separators.
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Fri, 09 Dec 2011 17:34:53 +0100 |
| parents | 6c8573dd1b6b |
| children | 5402fd9dd13e |
comparison
equal
deleted
inserted
replaced
| 15624:be43234a6d60 | 15625:efdcce3fd2d5 |
|---|---|
| 178 copy, diverge = copies.copies(repo, p1, p2, pa, dirs) | 178 copy, diverge = copies.copies(repo, p1, p2, pa, dirs) |
| 179 for of, fl in diverge.iteritems(): | 179 for of, fl in diverge.iteritems(): |
| 180 act("divergent renames", "dr", of, fl) | 180 act("divergent renames", "dr", of, fl) |
| 181 | 181 |
| 182 repo.ui.note(_("resolving manifests\n")) | 182 repo.ui.note(_("resolving manifests\n")) |
| 183 repo.ui.debug(" overwrite %s partial %s\n" % (overwrite, bool(partial))) | 183 repo.ui.debug(" overwrite: %s, partial: %s\n" |
| 184 repo.ui.debug(" ancestor %s local %s remote %s\n" % (pa, p1, p2)) | 184 % (bool(overwrite), bool(partial))) |
| 185 repo.ui.debug(" ancestor: %s, local: %s, remote: %s\n" % (pa, p1, p2)) | |
| 185 | 186 |
| 186 m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest() | 187 m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest() |
| 187 copied = set(copy.values()) | 188 copied = set(copy.values()) |
| 188 | 189 |
| 189 if '.hgsubstate' in m1: | 190 if '.hgsubstate' in m1: |