view tests/test-586 @ 6499:479847ccabe0

Added hgexecutable support for py2exe/frozen scripts
author "Paul Moore <p.f.moore@gmail.com>"
date Thu, 20 Dec 2007 20:02:51 +0000
parents 720ae5085ee3
children f1af59451c0c
line wrap: on
line source

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