Show More
@@ -103,7 +103,7 b' def update(repo, node, branchmerge=False' | |||||
103 | # we care about merging |
|
103 | # we care about merging | |
104 | repo.ui.note(_("resolving manifests\n")) |
|
104 | repo.ui.note(_("resolving manifests\n")) | |
105 | repo.ui.debug(_(" overwrite %s branchmerge %s partial %s linear %s\n") % |
|
105 | repo.ui.debug(_(" overwrite %s branchmerge %s partial %s linear %s\n") % | |
106 |
(overwrite, branchmerge, partial |
|
106 | (overwrite, branchmerge, bool(partial), linear_path)) | |
107 | repo.ui.debug(_(" ancestor %s local %s remote %s\n") % |
|
107 | repo.ui.debug(_(" ancestor %s local %s remote %s\n") % | |
108 | (short(man), short(m1n), short(m2n))) |
|
108 | (short(man), short(m1n), short(m2n))) | |
109 |
|
109 |
General Comments 0
You need to be logged in to leave comments.
Login now