Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-item: replace a `merged` usage with `p2_info`
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 01 Oct 2021 03:28:01 +0200
changeset 48151 e0b4e4f80fff
parent 48150 d71feb05d5b6
child 48152 8f88307f8e07
dirstate-item: replace a `merged` usage with `p2_info` It seems more accurate and no test complains (XXX hopefully XXX). Differential Revision: https://phab.mercurial-scm.org/D11595
mercurial/dirstatemap.py file | annotate | diff | comparison | revisions 
--- a/mercurial/dirstatemap.py	Fri Oct 01 03:26:12 2021 +0200
+++ b/mercurial/dirstatemap.py	Fri Oct 01 03:28:01 2021 +0200
@@ -162,7 +162,7 @@
             return False
         else:
             self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added)
-            if not entry.merged:
+            if not entry.p2_info:
                 self.copymap.pop(f, None)
             entry.set_untracked()
             self._refresh_entry(f, entry)
mercurial