Mercurial > hg

changeset 1448:182879d71922

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow reverting a deleted file with two parents As elsewhere, we choose the first parent by default
author Matt Mackall <mpm@selenic.com>
date Tue, 25 Oct 2005 15:52:27 -0700
parents 508a3f559553
children 30146be3437c
files mercurial/localrepo.py
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Tue Oct 25 15:51:28 2005 -0700
+++ b/mercurial/localrepo.py	Tue Oct 25 15:52:27 2005 -0700
@@ -556,11 +556,7 @@
                 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)