##// END OF EJS Templates
Added tests for bug with three-way-merging of old tip, tip and cwd.
Added tests for bug with three-way-merging of old tip, tip and cwd.

File last commit:

r790:d7380783 default
r792:49ec802b default
Show More
test-pull
22 lines | 267 B | text/plain | TextLexer
#!/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 &
sleep 1 # wait for server to be started
cd ..
hg clone http://localhost:20059/ copy
cd copy
hg verify
hg co
cat foo
hg manifest
hg pull
kill $!