Make this work with modern hg and some other stuff I hadn't commited yet
draft default tip
2020-10-07, Gary Kramlich