--- a/mercurial/tags.py	Sat Feb 17 22:39:12 2018 -0500
+++ b/mercurial/tags.py	Sat Feb 17 22:39:38 2018 -0500
@@ -739,7 +739,7 @@
         entry = bytearray(prefix + fnode)
         self._raw[offset:offset + _fnodesrecsize] = entry
         # self._dirtyoffset could be None.
-        self._dirtyoffset = min(self._dirtyoffset, offset) or 0
+        self._dirtyoffset = min(self._dirtyoffset or 0, offset or 0)
 
     def write(self):
         """Perform all necessary writes to cache file.