--- a/hgext/uncommit.py	Fri Jul 27 14:46:59 2018 -0700
+++ b/hgext/uncommit.py	Fri Jul 27 14:47:38 2018 -0700
@@ -182,7 +182,7 @@
 
             with repo.dirstate.parentchange():
                 repo.dirstate.setparents(newid, node.nullid)
-                s = repo.status(old.p1(), old, match=match)
+                s = old.p1().status(old, match=match)
                 _fixdirstate(repo, old, repo[newid], s)
 
 def predecessormarkers(ctx):