From patchwork Sun Oct  3 00:40:45 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D11595: dirstate-item: replace a `merged` usage with `from_p2`
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 49919
Message-Id: <differential-rev-PHID-DREV-lz5akxurkuxrxepaf2px-req@mercurial-scm.org>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Sun, 3 Oct 2021 00:40:45 +0000

marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  It seems more accurate and no test complains (XXX hopefully XXX).

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11595

AFFECTED FILES
  mercurial/dirstatemap.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py
--- a/mercurial/dirstatemap.py
+++ b/mercurial/dirstatemap.py
@@ -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)