# HG changeset patch
# User Franz Glasner <fzglas.hg@dom66.de>
# Date 1630454094 -7200
# Node ID 4b22cfae980d59ae70210365b2f6f6332e309559
# Parent  38f4e4474df00cec4ba10b3e17346bda19661e80
The `mergestate' class was moved to a new module `mercurial.mergestate' in HG 5.5: use this if available

diff -r 38f4e4474df0 -r 4b22cfae980d extensions/timestamps.py
--- a/extensions/timestamps.py	Sun Feb 02 16:40:47 2020 +0100
+++ b/extensions/timestamps.py	Wed Sep 01 01:54:54 2021 +0200
@@ -85,13 +85,17 @@
 from mercurial import (cmdutil, scmutil, config, util, error, pycompat,
                        demandimport)
 from mercurial import match as _matchmod
-from mercurial import merge as _mergemod
 with demandimport.deactivated():
     try:
         from mercurial import registrar
     except ImportError:
         registrar = None
 
+    try:
+        from mercurial.mergestate import mergestate
+    except ImportError:
+        from mercurial.merge import mergestate
+
 
 testedwith = b"4.5.2 4.6.1 4.8.1 4.9 5.0.1 5.1.2 5.2.1"
 
@@ -404,7 +408,7 @@
             if _DEV:
                 self.ui.debug("timestamps: UPDATE TO_UPDATE: "
                               + repr(to_update) + '\n')
-            ms = _mergemod.mergestate.read(self)
+            ms = mergestate.read(self)
             _debug_mergestate(self.ui, ms)
             if ms.active():
                 to_update.difference_update(set(ms.files()))