tests/test-conflict
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 05 Jun 2007 19:26:36 -0300
changeset 4506 9f952dd4413b
parent 4385 93a4e72b4f83
permissions -rwxr-xr-x
test-serve: let run-tests.py kill the daemons If the daemons die while the tests are still running, we'll get additional "killed!" messages, making the test fail.

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