comparison mercurial/templatekw.py @ 37878:1322ae04d3d7 stable

merge: do not fill manifest of committed revision with pseudo node (issue5526) Since a75d24539aba "convert: fix convert dropping p2 contents during filemap merge", wctx is not always a committablectx because the convert extension passes in repo[n] as wctx. If wctx is a committed changeset, its manifest dict shouldn't be mutated reflecting to the working directory.
author Yuya Nishihara <yuya@tcha.org>
date Tue, 19 Jun 2018 22:45:52 +0900
parents 24fee31fda05
children 8808d5d401ee
comparison
equal deleted inserted replaced
37877:ae7f27867c2a 37878:1322ae04d3d7