Mercurial > hg
changeset 9456:c564dbb2a6d5
Merge with crew-stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Thu, 17 Sep 2009 21:52:08 +0200 |
| parents | 176b7d42e6cc (current diff) 3e673c988c85 (diff) |
| children | f3f400b13984 ffeaf5ba25d8 3b283adcc720 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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():