From 9f5c1193b659563c6d3b16ccb46bfdf8a3831364 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 3 Jul 2021 19:02:18 +0000 Subject: [PATCH] hgrc: tweak my settings along the lines of https://octobus.net/blog/2020-11-26-modern-mercurial.html --- ops/nixos/lib/home-manager/hgrc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ops/nixos/lib/home-manager/hgrc b/ops/nixos/lib/home-manager/hgrc index d138eacf87..b95098e166 100644 --- a/ops/nixos/lib/home-manager/hgrc +++ b/ops/nixos/lib/home-manager/hgrc @@ -7,6 +7,16 @@ username = Luke Granger-Brown interface = curses tweakdefaults = True merge = internal:merge3 +mergemarkers = detailed + +[commands] +push.require-revs = true + +[paths] +default:pushrev = . + +[phases] +publish = false [alias] log = log --template lukegblogshort --graph @@ -60,3 +70,8 @@ evolve = topic = git = purge = +absorb = + +[experimental] +topic-mode = enforce +evolution = all