# HG changeset patch # User Durham Goode # Date 1413318420 25200 # Node ID 32f15b361f3608cdd5b998fe4ceb801db30d3af2 # Parent b1d694d3975e9eea7ccb2f58565c0d83153cd0e1 obsolete: prevent options from being used without createmarkers exchange and allowunstable should only be enabled if createmarkers is enabled, so check for that and raise an exception if that's not the case. diff -r b1d694d3975e -r 32f15b361f36 mercurial/obsolete.py --- a/mercurial/obsolete.py Tue Oct 14 13:26:01 2014 -0700 +++ b/mercurial/obsolete.py Tue Oct 14 13:27:00 2014 -0700 @@ -1165,4 +1165,10 @@ if len(result) == 0 and _enabled: return True + # createmarkers must be enabled if other options are enabled + if ((allowunstableopt in result or exchangeopt in result) and + not createmarkersopt in result): + raise util.Abort(_("'createmarkers' obsolete option must be enabled " + "if other obsolete options are enabled")) + return option in result