Mercurial > public > mercurial-scm > hg-stable
diff 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 |
line wrap: on
line diff
--- a/mercurial/merge.py Fri Dec 09 15:50:33 2011 +0100 +++ b/mercurial/merge.py Fri Dec 09 17:34:53 2011 +0100 @@ -180,8 +180,9 @@ act("divergent renames", "dr", of, fl) repo.ui.note(_("resolving manifests\n")) - repo.ui.debug(" overwrite %s partial %s\n" % (overwrite, bool(partial))) - repo.ui.debug(" ancestor %s local %s remote %s\n" % (pa, p1, p2)) + repo.ui.debug(" overwrite: %s, partial: %s\n" + % (bool(overwrite), bool(partial))) + repo.ui.debug(" ancestor: %s, local: %s, remote: %s\n" % (pa, p1, p2)) m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest() copied = set(copy.values())