view tests/test-issue612 @ 11453:2ee26044d846 stable

context: allow passing the common cset ancestor to fctx.ancestor

This is used by the next patch to speed up merge.applyupdates.

#!/bin/sh

mkdir t
cd t

hg init
mkdir src
echo a > src/a.c
hg ci -Ama -d "10000000 0"

hg mv src source
hg ci -Ammove -d "1000000 0"

hg co -C 0
echo new > src/a.c
echo compiled > src/a.o
hg ci -mupdate -d "1000000 0"

hg st

hg merge

hg st