view tests/test-rename-merge1 @ 10300:c437745f50ec

run-tests: split tests/blacklist in tests/blacklists/*

Following discussions with Gilles Morris [1], it seems that it is preferable to
use several blacklist files in a blacklists/ directory. It is easier to add an
unversioned file for experiments than modifying a tracked file.

Also fall back to a simpler syntax, giving up ConfigParser, now that section
names are not needed anymore.

And allow --blacklist parameter to be a complete path, instead of only one
of the filenames contained in tests/blacklists/


[1] http://www.selenic.com/pipermail/mercurial-devel/2009-December/017317.html

#!/bin/sh

mkdir t
cd t
hg init
echo "[merge]" >> .hg/hgrc
echo "followcopies = 1" >> .hg/hgrc
echo foo > a
echo foo > a2
hg add a a2
hg ci -m "start"
hg mv a b
hg mv a2 b2
hg ci -m "rename"
echo "checkout"
hg co 0
echo blahblah > a
echo blahblah > a2
hg mv a2 c2
hg ci -m "modify"
echo "merge"
hg merge -y --debug
hg status -AC
cat b
hg ci -m "merge"
hg debugindex .hg/store/data/b.i
hg debugrename b