view tests/test-issue619 @ 10969:ca052b484e56

context: remove parents parameter to workingctx

it was needed before the refactor of commit, workingctx always uses the
dirstate now.

#!/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