tests/test-issue619
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 11 Jul 2007 18:15:21 -0300
changeset 4863 0875082d5471
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
util._hgexecutable: default to 'hg' This should make hooks work even if util.set_hgexecutable is not called (e.g. hgweb.cgi). Fixes issue625.

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg ci -Ama -d '1000000000 0'
echo b > b
hg branch b
hg ci -Amb -d '1000000000 0'
hg co -C 0

echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'

echo bogus fast-forward should fail
hg merge b

echo done