Mercurial > hg

changeset 50155:4c67862a0c49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: phase-divergent update to 3433723d1b9b Heptapod published the obsolete version of those.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 19 Feb 2023 03:21:12 +0100
parents 028fb89a0539
children 7e6c5cfaba6a
files mercurial/dirstate.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dirstate.py	Wed Feb 22 03:42:36 2023 +0100
+++ b/mercurial/dirstate.py	Sun Feb 19 03:21:12 2023 +0100
@@ -285,8 +285,8 @@
 
         has_tr = repo.currenttransaction() is not None
         if not has_tr and self._changing_level == 0 and self._dirty:
-            msg = "entering a changing context, but dirstate is already dirty"
-            raise error.ProgrammingError(msg)
+            msg = b"entering a changing context, but dirstate is already dirty"
+            repo.ui.develwarn(msg)
 
         assert self._changing_level >= 0
         # different type of change are mutually exclusive