# HG changeset patch # User Stuart W Marks # Date 1253216045 -7200 # Node ID e78967d3dd6f8544ced22102d88efbb0360fe189 # Parent bc6b0fef9495b3944580a6bd26c7adecc87c3f88 commands: forbid 'hg update --check --clean' diff -r bc6b0fef9495 -r e78967d3dd6f mercurial/commands.py --- a/mercurial/commands.py Mon Sep 14 19:53:43 2009 -0500 +++ b/mercurial/commands.py Thu Sep 17 21:34:05 2009 +0200 @@ -3040,7 +3040,10 @@ if not rev: rev = node - if not clean and check: + if check and clean: + raise util.Abort(_("cannot specify both -c and -C")) + + 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():