# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1626659574 -7200
# Node ID dc610e325302a80a1db74a4f7d111b0e3ee65d32
# Parent  485ae37a7ec50bb309db2c6911cd58dcb468b454
revert: use `set_possibly_dirty` instead of `normallookup`

This is the newer, more semantic API.

Differential Revision: https://phab.mercurial-scm.org/D11174

diff -r 485ae37a7ec5 -r dc610e325302 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Mon Jul 19 14:02:58 2021 +0200
+++ b/mercurial/cmdutil.py	Mon Jul 19 03:52:54 2021 +0200
@@ -3610,7 +3610,7 @@
         # to report the file as clean. We have to use normallookup for
         # merges to avoid losing information about merged/dirty files.
         if p2 != repo.nullid:
-            normal = repo.dirstate.normallookup
+            normal = repo.dirstate.set_tracked
         else:
             normal = repo.dirstate.set_clean
 
@@ -3703,7 +3703,7 @@
             checkout(f)
             repo.dirstate.set_tracked(f)
 
-    normal = repo.dirstate.normallookup
+    normal = repo.dirstate.set_tracked
     if node == parent and p2 == repo.nullid:
         normal = repo.dirstate.set_clean
     for f in actions[b'undelete'][0]: