# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1141859664 28800
# Node ID 91ebf29c15958c44c0e81cac3cb33bb568a79c37
# Parent  1ed809a2104ec0bd13e44cc4b4bb04f931b621e2
add -f/--force to remove command.
else to remove modified file, must use "hg revert; hg rm"
or "rm; hg rm --after".


diff -r 1ed809a2104e -r 91ebf29c1595 mercurial/commands.py
--- a/mercurial/commands.py	Wed Mar 08 11:21:45 2006 -0800
+++ b/mercurial/commands.py	Wed Mar 08 15:14:24 2006 -0800
@@ -1920,7 +1920,7 @@
     def okaytoremove(abs, rel, exact):
         modified, added, removed, deleted, unknown = repo.changes(files=[abs])
         reason = None
-        if modified:
+        if modified and not opts['force']:
             reason = _('is modified')
         elif added:
             reason = _('has been marked for add')
@@ -2564,7 +2564,8 @@
     "^remove|rm":
         (remove,
          [('I', 'include', [], _('include names matching the given patterns')),
-          ('X', 'exclude', [], _('exclude names matching the given patterns'))],
+          ('X', 'exclude', [], _('exclude names matching the given patterns')),
+          ('f', 'force', None, _('remove file even if modified'))],
          _('hg remove [OPTION]... FILE...')),
     "rename|mv":
         (rename,