view tests/test-issue672 @ 5583:1b5b81d9039b

win32: read system rcpath from registry

Using the module name was not always helpful.  It breaks down
when Mercurial is installed as source and when the Mercurial
libs are used by external applications.

This patch allows Mercurial installers to store the system wide
rcpath in the registry, where it can always be found.  HGRCPATH
is a poor option for storing the system wide rcpath, since it
overrides both the system and user rcpaths.

#!/bin/sh

# 0-2-4
#  \ \ \
#   1-3-5
#
# rename in #1, content change in #4.

hg init t
cd t

touch 1
touch 2
hg commit -Am init -d "0 0"  # 0

hg rename 1 1a
hg commit -m rename -d "0 0" # 1

hg co -C 0
echo unrelated >> 2
hg ci -m unrelated1 -d "0 0"  # 2

hg merge --debug 1
hg ci -m merge1 -d "0 0" # 3

hg co -C 2
echo hello >> 1
hg ci -m unrelated2 -d "0 0" # 4

hg co -C 3
hg merge -y --debug 4

hg co -C 4
hg merge -y --debug 3