view tests/test-586 @ 12083:ebfc46929f3e stable

help: refer to user configuration file more consistently

Currently, a number of commands and help topics mention the user hgrc
file in different ways. Among these are following:

1. .hgrc - "please specify your commit editor/username in your .hgrc
file", bookmarks, color, hgk, pager, hg help environment

2. $HOME/.hgrc - hg help paths, hgrc(5), hg(1)

3. ~/.hgrc - hgrc(5)

In addition to being inconsistent, none of these make sense on
Windows. This patch replaces the above with a more general term of
"[your] configuration file".

#!/bin/sh
# a test for issue586

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc

hg st -A
cd ..

# a test for issue 1433, related to issue586
echo % create test repos
hg init repoa
touch repoa/a
hg -R repoa ci -Am adda

hg init repob
touch repob/b
hg -R repob ci -Am addb

hg init repoc
cd repoc
hg pull ../repoa
hg update
mkdir tst
hg mv * tst
hg ci -m "import a in tst"
hg pull -f ../repob
echo % merge both repos
hg merge
mkdir src
echo % move b content
hg mv b src
hg ci -m "import b in src"
hg manifest