Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 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 0847c45ffee6
comparison
equal deleted inserted replaced
1447:508a3f559553 1448:182879d71922
554 self.ui.warn(_("%s not tracked!\n") % f) 554 self.ui.warn(_("%s not tracked!\n") % f)
555 else: 555 else:
556 self.dirstate.update([f], "r") 556 self.dirstate.update([f], "r")
557 557
558 def undelete(self, list): 558 def undelete(self, list):
559 pl = self.dirstate.parents() 559 p = self.dirstate.parents()[0]
560 if pl[1] != nullid:
561 self.ui.warn("aborting: outstanding uncommitted merges\n")
562 return 1
563 p = pl[0]
564 mn = self.changelog.read(p)[0] 560 mn = self.changelog.read(p)[0]
565 mf = self.manifest.readflags(mn) 561 mf = self.manifest.readflags(mn)
566 m = self.manifest.read(mn) 562 m = self.manifest.read(mn)
567 for f in list: 563 for f in list:
568 if self.dirstate.state(f) not in "r": 564 if self.dirstate.state(f) not in "r":