compat: can't compare two values of unequal datatypes

mercurial/copies.py

@@ -42,7 +42,7 b' def _findoldnames(fctx, limit):'
         seen.add(s)
         if fc.path() != orig and fc.path() not in old:
             old[fc.path()] = (depth, fc.path()) # remember depth
-        if fc.rev() < limit and fc.rev() is not None:
+        if fc.rev() is not None and fc.rev() < limit:
             continue
         visit += [(p, depth - 1) for p in fc.parents()]
 

mercurial/merge.py

@@ -288,7 +288,7 b' def applyupdates(repo, action, wctx, mct'
                 continue
             f2, fd, flags, move = a[2:]
             r = ms.resolve(fd, wctx, mctx)
-            if r > 0:
+            if r is not None and r > 0:
                 unresolved += 1
             else:
                 if r is None: