changeset 1448 | 182879d71922 |
parent 1447 | 508a3f559553 |
child 1469 | 0847c45ffee6 |
--- 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)