diff -r 848a04c078c7 -r eaf82490af76 hgext/evolve.py --- a/hgext/evolve.py Tue Jun 16 15:14:37 2015 -0700 +++ b/hgext/evolve.py Tue Jun 16 16:58:38 2015 -0700 @@ -1439,6 +1439,8 @@ revs = set([tro]) elif targetcat in repo['.'].troubles(): revs = set([repo['.'].rev()]) + if revopt and anyopt: + raise util.Abort('cannot specify both "--rev" and "--any"') if not revs: msg = "no troubled changes in the specified revisions" raise util.Abort(msg)