##// END OF EJS Templates
py3: convert bool variables to bytes before passing into ui.debug()...
Pulkit Goyal -
r32641:49e1e5ac default
parent child Browse files
Show More
@@ -807,9 +807,12 b' def manifestmerge(repo, wctx, p2, pa, br'
807 807 ret = copies.mergecopies(repo, wctx, p2, pa)
808 808 copy, movewithdir, diverge, renamedelete, dirmove = ret
809 809
810 boolbm = pycompat.bytestr(bool(branchmerge))
811 boolf = pycompat.bytestr(bool(force))
812 boolm = pycompat.bytestr(bool(matcher))
810 813 repo.ui.note(_("resolving manifests\n"))
811 814 repo.ui.debug(" branchmerge: %s, force: %s, partial: %s\n"
812 % (bool(branchmerge), bool(force), bool(matcher)))
815 % (boolbm, boolf, boolm))
813 816 repo.ui.debug(" ancestor: %s, local: %s, remote: %s\n" % (pa, wctx, p2))
814 817
815 818 m1, m2, ma = wctx.manifest(), p2.manifest(), pa.manifest()
General Comments 0
You need to be logged in to leave comments. Login now