From 7453a749c72cb903163c5fec957494e01b4d1634 Mon Sep 17 00:00:00 2001
From: Robin Munn <rmunn@pobox.com>
Date: Mon, 16 Jun 2025 12:38:02 +0700
Subject: [PATCH] Increase Chorus merge timeout to 60 minutes

At least one project took 23 minutes 3 seconds to do an hg merge
operation, so Chorus's default 15 minute timeout is too low.
---
 environ | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/environ b/environ
index 118ac7c1..e086df98 100644
--- a/environ
+++ b/environ
@@ -9,3 +9,6 @@ export PATH="${BASE}/output/${BUILD}/net8.0:${BASE}/output/Mercurial:${PATH}"
 # set HGRCPATH so that we ignore ~/.hgrc files which might have content that is
 # incompatible with our version of Mercurial
 export HGRCPATH=/etc/mercurial/hgrc
+
+# Increase Chorus timeout to 60 minutes since some projects take longer than 15 minutes to merge
+export CHORUS_LOCAL_TIMEOUT_SECONDS=3600