.hgautomerge
author Jan Vrany <jan.vrany@labware.com>
Fri, 02 Sep 2022 11:25:39 +0100
branchjv
changeset 6261 9b7eb7159d29
parent 5356 cb85624d1068
permissions -rw-r--r--
Fix loong standing bug with some menus not being translated / resolved This has happened with browser "View" menu when sometimes it had the slice resolved and sometimes not. It turned out that it was because the code disabled resources (and therefore slices) resolution when processing shortcuts, so the menu was created and cached unresolved. This fixes the issue. eXept apparently run into the same problem.

[automerge]
# Automatically merge pulled changes from specified mercurial branch (if exists) 
# to specified mercurial branch (if exists). The syntax is 
# 
# automerge = <from-branch>:<to branch>. 
#
# The example below will merge changed from branch `default` to branch `jv`. 
# If merge fails, issue a warning but proceed. Optional. 
#
# automerge = default:jv
automerge = default:jv
#
# If defined and if merge succeeds (there are no unresolved conflicts), 
# check the merged working copy using given command. The command is executed
# with CWD set to repository root. `#{dir}` in the command string will be 
# expanded to actuall repository path. 
# Following commands are built-in: 
# 
# * internal:make - run `make`
#
# A command line option --check overrides this setting. See `hg-automerge --help`.
# 
# checkcmd = internal:make
checkcmd = internal:make