# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1130280747 25200
# Node ID 182879d719222ad1b73ec59932e0a6268ed1e7d8
# Parent  508a3f559553425e908a45628eb51fcb4b43750a
Allow reverting a deleted file with two parents

As elsewhere, we choose the first parent by default



diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -556,11 +556,7 @@ class localrepository:
                 self.dirstate.update([f], "r")
 
     def undelete(self, list):
-        pl = self.dirstate.parents()
-        if pl[1] != nullid:
-            self.ui.warn("aborting: outstanding uncommitted merges\n")
-            return 1
-        p = pl[0]
+        p = self.dirstate.parents()[0]
         mn = self.changelog.read(p)[0]
         mf = self.manifest.readflags(mn)
         m = self.manifest.read(mn)