Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 657:22bc6fb9aefc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate.forget() takes a list -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 dirstate.forget() takes a list manifest hash: e444474a5ac76d3562ee8c0211e1a88ec53155ef -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC0WO+ywK+sNU5EO8RAlmYAJ9pcSgpvvuqLzfUkeApXZyOb3j6pQCgi9Te e8ZI236WNWfyrwEASxFIeLM= =yDVZ -----END PGP SIGNATURE-----
author Matt Mackall <mpm@selenic.com>
date Sun, 10 Jul 2005 10:06:54 -0800
parents 147d2fa2d766
children f8098ae9f5b6
comparison
equal deleted inserted replaced
656:147d2fa2d766 657:22bc6fb9aefc
895 p = self.wjoin(f) 895 p = self.wjoin(f)
896 if os.path.exists(p): 896 if os.path.exists(p):
897 self.ui.warn("%s still exists!\n" % f) 897 self.ui.warn("%s still exists!\n" % f)
898 elif self.dirstate.state(f) == 'a': 898 elif self.dirstate.state(f) == 'a':
899 self.ui.warn("%s never committed!\n" % f) 899 self.ui.warn("%s never committed!\n" % f)
900 self.dirstate.forget(f) 900 self.dirstate.forget([f])
901 elif f not in self.dirstate: 901 elif f not in self.dirstate:
902 self.ui.warn("%s not tracked!\n" % f) 902 self.ui.warn("%s not tracked!\n" % f)
903 else: 903 else:
904 self.dirstate.update([f], "r") 904 self.dirstate.update([f], "r")
905 905