tests/test-merge-default
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 24 Aug 2006 15:19:56 -0700
changeset 3014 47aad3489da8
parent 2903 013921c753bd
child 5224 9cd6578750b9
permissions -rwxr-xr-x
Fixed an exception in notify extension (b2a_hex argument incorrect) Detailed messages was - incoming.notify hook raised an exception: b2a_hex() argument 1 must be string or read-only character buffer, not stringio

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