Mercurial > hg

diff mercurial/dirstate.py @ 48148:e2753a7acfa7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-item: use the `p2_info` property to replace more verbose call Differential Revision: https://phab.mercurial-scm.org/D11592
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 01 Oct 2021 04:04:38 +0200
parents 142e9f0a70b5
children b4f83c9e7905
line wrap: on
line diff
--- a/mercurial/dirstate.py	Wed Sep 29 02:06:04 2021 +0200
+++ b/mercurial/dirstate.py	Fri Oct 01 04:04:38 2021 +0200
@@ -1372,7 +1372,7 @@
 
             if not st and t.tracked:
                 dadd(fn)
-            elif t.merged or t.from_p2:
+            elif t.p2_info:
                 madd(fn)
             elif t.added:
                 aadd(fn)