tests/test-586
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 11 Jul 2007 18:15:21 -0300
changeset 4863 0875082d5471
parent 4536 720ae5085ee3
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
# a test for issue586

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc

hg st -A