Mercurial > hg-stable
diff mercurial/dirstate.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 | d5d42c170f4d |
children | adacefb0b7ea a3cabe9415e1 |