Mercurial > hg

changeset 8699:f364cc1d98c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: apply force flag without files
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Jun 2009 13:51:21 -0500
parents 4ea995e5aac0
children a96b049075a8
files mercurial/localrepo.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Mon Jun 01 13:51:21 2009 -0500
+++ b/mercurial/localrepo.py	Mon Jun 01 13:51:21 2009 -0500
@@ -801,7 +801,9 @@
                         self.ui.warn(_("%s not tracked!\n") % f)
                 changes = [modified, [], removed, [], []]
             else:
-                changes = self.status(match=match)
+                changes = self.status(match=match, clean=force)
+                if force:
+                    changes[0].extend(changes[6])
 
             if (not force and not extra.get("close") and p2 == nullid
                 and not (changes[0] or changes[1] or changes[2])