mercurial/repoview.py

--- a/mercurial/repoview.py	Wed Sep 23 16:07:14 2020 -0700
+++ b/mercurial/repoview.py	Wed Sep 23 15:36:15 2020 -0700
@@ -70,8 +70,10 @@
 
     ms = mergestate.mergestate.read(repo)
     if ms.active():
-        pinned.add(ms.localctx.rev())
-        pinned.add(ms.otherctx.rev())
+        for node in (ms.local, ms.other):
+            rev = cl.index.get_rev(node)
+            if rev is not None:
+                pinned.add(rev)
 
     return pinned