tests/test-merge-default
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 09 Feb 2007 03:48:28 -0200
changeset 4070 961ccb615cf7
parent 2903 013921c753bd
child 5224 9cd6578750b9
permissions -rwxr-xr-x
Handle functions as the value of a hooks.<name> config variable This should make it easier for extensions to add a hook when they're loaded.

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