update ui.quiet/verbose/debug/interactive every time the config changes - ui.quiet/verbose/debug/interactive become just a cache of the ui.cdata settings - the quiet, verbose, debug and interactive options from the [ui] section from .hg/hgrc files are respected for commands that open the repo - setting ui.quiet/verbose/debug/interactive with --config works - the command line options always override the hgrc settings - previously it wasn't possible to override a [ui] debug = True. --debug still takes precedence over --quiet and --verbose.

     1

#!/bin/sh

     2

     3

mkdir t

     4

cd t

     5

hg init

     6

echo "[merge]" >> .hg/hgrc

     7

echo "followcopies = 1" >> .hg/hgrc

     8

echo foo > a

     9

echo foo > a2

    10

hg add a a2

    11

hg ci -m "start" -d "0 0"

    12

hg mv a b

    13

hg mv a2 b2

    14

hg ci -m "rename" -d "0 0"

    15

echo "checkout"

    16

hg co 0

    17

echo blahblah > a

    18

echo blahblah > a2

    19

hg mv a2 c2

    20

hg ci -m "modify" -d "0 0"

    21

echo "merge"

    22

hg merge -y --debug

    23

hg status -AC

    24

cat b

    25

hg ci -m "merge" -d "0 0"

    26

hg debugindex .hg/data/b.i

    27

hg debugrename b