view tests/test-issue619 @ 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
echo a > a
hg ci -Ama -d '1000000000 0'
echo b > b
hg branch b
hg ci -Amb -d '1000000000 0'
hg co -C 0

echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'

echo bogus fast-forward should fail
hg merge b

echo done