hgext/largefiles/overrides.py
branchstable
changeset 15786 aca0f2b3c7e3
parent 15663 9036c7d106bf
child 15787 0c7b83a057aa
--- a/hgext/largefiles/overrides.py	Fri Jan 06 11:15:32 2012 +0100
+++ b/hgext/largefiles/overrides.py	Sun Jan 08 11:19:51 2012 +0100
@@ -130,7 +130,7 @@
     orig(ui, repo, *pats, **opts)
     restorematchfn()
 
-    after, force = opts.get('after'), opts.get('force')
+    after = opts.get('after')
     if not pats and not after:
         raise util.Abort(_('no files specified'))
     m = scmutil.match(repo[None], pats, opts)
@@ -145,12 +145,10 @@
 
     def warn(files, reason):
         for f in files:
-            ui.warn(_('not removing %s: %s (use -f to force removal)\n')
+            ui.warn(_('not removing %s: %s (use forget to undo)\n')
                     % (m.rel(f), reason))
 
-    if force:
-        remove, forget = modified + deleted + clean, added
-    elif after:
+    if after:
         remove, forget = deleted, []
         warn(modified + added + clean, _('file still exists'))
     else: