view tests/test-merge-default @ 9658:852b1f3032d2

hook: only redirect stdout if it and stderr are valid files When using hgwebdir with WSGI via the IIS ISAPI-WSGI extension, both stdout and stderr filenos are set to -2, which makes the os.dup call in hook.py fail.
author Sune Foldager <cryo@cyanite.org>
date Wed, 28 Oct 2009 21:35:57 +0100
parents 6d36fc70754e
children a5576908b589
line wrap: on
line source

#!/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 -P
hg merge
hg commit -mm2

echo % should fail because at tip
hg merge

hg up 0
echo % should fail because 1 head
hg merge

true