Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
authorMartin Geisler <mg@lazybytes.net>
Thu, 17 Sep 2009 21:52:08 +0200
changeset 9456 c564dbb2a6d5
parent 9455 176b7d42e6cc (current diff)
parent 9451 3e673c988c85 (diff)
child 9457 f3f400b13984
child 9458 ffeaf5ba25d8
child 9459 3b283adcc720
Merge with crew-stable
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Thu Sep 17 21:51:55 2009 +0200
+++ b/mercurial/commands.py	Thu Sep 17 21:52:08 2009 +0200
@@ -3047,7 +3047,10 @@
     if not rev:
         rev = node
 
-    if not clean and check:
+    if check and clean:
+        raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
+
+    if check:
         # we could use dirty() but we can ignore merge and branch trivia
         c = repo[None]
         if c.modified() or c.added() or c.removed():
Mercurial