Mercurial > hg

diff mercurial/dirstatemap.py @ 47529:d3cf20328abd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: infer the 'n' state from `from_p2` This flag is only used with 'n' so lets set the state based on that parameter in this case. Differential Revision: https://phab.mercurial-scm.org/D10971
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 04 Jul 2021 01:58:03 +0200
parents 80617f3c0f9a
children a1745a292885
line wrap: on
line diff
--- a/mercurial/dirstatemap.py	Sun Jul 04 01:57:28 2021 +0200
+++ b/mercurial/dirstatemap.py	Sun Jul 04 01:58:03 2021 +0200
@@ -172,6 +172,7 @@
             mtime = AMBIGUOUS_TIME
         elif from_p2:
             assert not possibly_dirty
+            state = b'n'
             size = FROM_P2
             mtime = AMBIGUOUS_TIME
         elif possibly_dirty: