view tests/test-rename-dir-merge2 @ 5197:55860a45bbf2

Enable demandimport only in scripts, not in importable modules (issue605)

This way other applications can choose if and when they want this feature,
because it might be problematic if those applications rely on ImportError.

#!/bin/sh

mkdir r1
cd r1
hg init
mkdir a
echo foo > a/f
hg add a
hg ci -m "a/f == foo"
cd ..

hg clone r1 r2
cd r2
hg mv a b
echo foo1 > b/f
hg ci -m" a -> b, b/f == foo1"
cd ..

cd r1
mkdir a/aa
echo bar > a/aa/g
hg add a/aa
hg ci -m "a/aa/g"
hg pull ../r2

hg merge

hg st -C