--- a/mercurial/localrepo.py	Thu Jan 12 13:35:09 2006 +0100
+++ b/mercurial/localrepo.py	Thu Jan 12 13:58:36 2006 +0100
@@ -355,7 +355,7 @@
                 else:
                     self.ui.warn(_("%s not tracked!\n") % f)
         else:
-            modified, added, removed, unknown = self.changes(match=match)
+            modified, added, removed, deleted, unknown = self.changes(match=match)
             commit = modified + added
             remove = removed
 
@@ -544,12 +544,10 @@
 
             removed = mf1.keys()
 
-        removed.extend(deleted) #XXX get rid of this when returning deleted
-
         # sort and return results:
-        for l in modified, added, removed, unknown:
+        for l in modified, added, removed, deleted, unknown:
             l.sort()
-        return (modified, added, removed, unknown)
+        return (modified, added, removed, deleted, unknown)
 
     def add(self, list):
         wlock = self.wlock()
@@ -1392,7 +1390,7 @@
         ma = self.manifest.read(man)
         mfa = self.manifest.readflags(man)
 
-        modified, added, removed, unknown = self.changes()
+        modified, added, removed, deleted, unknown = self.changes()
 
         if allow and not forcemerge:
             if modified or added or removed:
@@ -1434,7 +1432,7 @@
         if moddirstate:
             wlock = self.wlock()
 
-        for f in removed:
+        for f in deleted:
             if f in mw:
                 del mw[f]