tests/test-merge-default
author Wojciech Milkowski <wmilkowski@interia.pl>
Wed, 04 Oct 2006 18:06:03 +0200
changeset 3244 f045b049a704
parent 2903 013921c753bd
child 5224 9cd6578750b9
permissions -rwxr-xr-x
Fix static file serving over HTTP on Windows. Files to be served should be opened in binary mode.

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