view tests/test-unrelated-pull @ 3538:9b52239dc740

save settings from untrusted config files in a separate configparser This untrusted configparser is a superset of the trusted configparser, so that interpolation still works. Also add an "untrusted" argument to ui.config* to allow querying ui.ucdata. With --debug, we print a warning when we read an untrusted config file, and when we try to access a trusted setting that has one value in the trusted configparser and another in the untrusted configparser.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Thu, 26 Oct 2006 19:25:45 +0200
parents dac4bd67f6c5
children
line wrap: on
line source

#!/bin/sh

mkdir a
cd a
hg init
echo 123 > a
hg add a
hg commit -m "a" -u a -d "1000000 0"

cd ..
mkdir b
cd b
hg init
echo 321 > b
hg add b
hg commit -m "b" -u b -d "1000000 0"

hg pull ../a
hg pull -f ../a
hg heads