Show More
@@ -807,9 +807,12 b' def manifestmerge(repo, wctx, p2, pa, br' | |||||
807 | ret = copies.mergecopies(repo, wctx, p2, pa) |
|
807 | ret = copies.mergecopies(repo, wctx, p2, pa) | |
808 | copy, movewithdir, diverge, renamedelete, dirmove = ret |
|
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 | repo.ui.note(_("resolving manifests\n")) |
|
813 | repo.ui.note(_("resolving manifests\n")) | |
811 | repo.ui.debug(" branchmerge: %s, force: %s, partial: %s\n" |
|
814 | repo.ui.debug(" branchmerge: %s, force: %s, partial: %s\n" | |
812 |
% (bool |
|
815 | % (boolbm, boolf, boolm)) | |
813 | repo.ui.debug(" ancestor: %s, local: %s, remote: %s\n" % (pa, wctx, p2)) |
|
816 | repo.ui.debug(" ancestor: %s, local: %s, remote: %s\n" % (pa, wctx, p2)) | |
814 |
|
817 | |||
815 | m1, m2, ma = wctx.manifest(), p2.manifest(), pa.manifest() |
|
818 | m1, m2, ma = wctx.manifest(), p2.manifest(), pa.manifest() |
General Comments 0
You need to be logged in to leave comments.
Login now