tests/test-merge-default
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 05 Jun 2007 19:26:36 -0300
changeset 4506 9f952dd4413b
parent 2903 013921c753bd
child 5224 9cd6578750b9
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 a > a
hg commit -A -ma

echo a >> a
hg commit -mb

echo a >> a
hg commit -mc

hg up 1
echo a >> a
hg commit -md

hg up 1
echo a >> a
hg commit -me

hg up 1
echo % should fail because not at a head
hg merge

hg up
echo % should fail because \> 2 heads
hg merge

echo % should succeed
hg merge 2
hg commit -mm1

echo % should succeed - 2 heads
hg merge
hg commit -mm2

echo % should fail because 1 head
hg merge

true