tweakdefaults: remove "bisect" from commands.status.skipstates
authorMartin von Zweigbergk <martinvonz@google.com>
Wed, 09 May 2018 13:46:31 -0700
changeset 37917 c6904da6ab15
parent 37916 34f259a1c153
child 37918 120c343c38b7
tweakdefaults: remove "bisect" from commands.status.skipstates If you forget to clear bisect state after you're done bisecting (as I've done twice in the last week or so), the next time you run `hg bisect --good/--bad`, it's going to tell you "The first bad revision is:" etc. It's probably not obvious to new users what's going on, and having the verbose output about an ongoing bisection will probably help them, so let's turn it back on by default. Differential Revision: https://phab.mercurial-scm.org/D3516
mercurial/ui.py
--- a/mercurial/ui.py	Tue Apr 03 22:58:33 2018 +0900
+++ b/mercurial/ui.py	Wed May 09 13:46:31 2018 -0700
@@ -66,8 +66,6 @@
 update.check = noconflict
 # Show conflicts information in `hg status`
 status.verbose = True
-# Skip the bisect state in conflicts information in `hg status`
-status.skipstates = bisect
 
 [diff]
 git = 1