# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1253217128 -7200
# Node ID c564dbb2a6d5394c995c1ae93943a16253e7b1e5
# Parent  176b7d42e6cc0d52867286a1fdb8f7202792532d# Parent  3e673c988c85ada261f9f87555c894cf1f429386
Merge with crew-stable

diff -r 176b7d42e6cc -r c564dbb2a6d5 mercurial/commands.py
--- 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():