diff -r d3adb454c5a9 -r 482d3fb47d80 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Thu Jun 01 18:36:32 2006 +0200
+++ b/mercurial/localrepo.py	Thu Jun 01 19:08:29 2006 +0200
@@ -303,7 +303,7 @@
         if tr != None and tr.running():
             return tr.nest()
 
-        # save dirstate for undo
+        # save dirstate for rollback
         try:
             ds = self.opener("dirstate").read()
         except IOError:
@@ -327,7 +327,7 @@
             self.ui.warn(_("no interrupted transaction available\n"))
             return False
 
-    def undo(self, wlock=None):
+    def rollback(self, wlock=None):
         if not wlock:
             wlock = self.wlock()
         l = self.lock()
@@ -338,7 +338,7 @@
             self.reload()
             self.wreload()
         else:
-            self.ui.warn(_("no undo information available\n"))
+            self.ui.warn(_("no rollback information available\n"))
 
     def wreload(self):
         self.dirstate.read()