tests/test-pull
author mpm@selenic.com
Sat, 23 Jul 2005 10:00:56 -0500
changeset 768 20e95c245bc3
parent 749 7e4843b7efd2
child 790 d7380783a086
child 793 445970ccf57a
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rwxr-xr-x
Fix local file changes being ignored after non-branch merge Bug introduced in eea96285cbf9 Spotted by TAH

#!/bin/sh

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -m 1
hg verify
hg serve -p 20059 > /dev/null &
cd ..

hg clone http://localhost:20059/ copy
cd copy
hg verify
hg co
cat foo
hg manifest
hg pull

kill $!