view tests/test-conflict @ 6835:08d9e0f974d9

make mq and tags hardlink safe

The code didn't check for modes like "r+" or "rb+".
Many thanks to agriffis for noticing it.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status