tests/test-conflict
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 10 Sep 2008 17:55:49 +0200
changeset 7020 5e9965407d53
parent 4387 93a4e72b4f83
permissions -rwxr-xr-x
make test-mq-qdelete work reliably (issue1180) if after a and b has been applied, their hash starts with c, then the test would fail (because there would be a rev c which would be seen as "applied") so probability of failure would be 2*1/16.

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