view tests/test-issue619 @ 10836:e5aaa4543289 stable

dirstate: fix in memory dirstate entries for 1-second race

Only the on-disk file was modified, we need to modify the in-memory dirstate
as well.

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