##// END OF EJS Templates
Update on pull -u when heads were closed (fixes issue666)....
Update on pull -u when heads were closed (fixes issue666). Patch written by Benoit Boissinot. This should probably be improved in the future to handle long-living branches, as joining two "other" heads will switch to that new head. But this is not a new problem, as adding to the "other" head would have switched to that new head, too.

File last commit:

r4891:2d545b98 default
r5080:73fdc8bd default
Show More
test-pull
26 lines | 345 B | text/plain | TextLexer
Thomas Arendsen Hein
Remove bashisms and use /bin/sh instead of /bin/bash....
r544 #!/bin/sh
mpm@selenic.com
Add some more tests...
r336
mkdir test
cd test
echo foo>foo
hg init
hg addremove
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg commit -m 1
mpm@selenic.com
Add some more tests...
r336 hg verify
Thomas Arendsen Hein
Don't use mktemp in tests, we're already in a secure temp dir.
r1786 hg serve -p 20059 -d --pid-file=hg.pid
Vadim Gelfer
tests: add timeouts, make run-tests.py clean up dead daemon processes...
r2571 cat hg.pid >> $DAEMON_PIDS
mpm@selenic.com
Add some more tests...
r336 cd ..
Vadim Gelfer
add support for streaming clone....
r2612 http_proxy= hg clone --pull http://localhost:20059/ copy
mpm@selenic.com
Add some more tests...
r336 cd copy
hg verify
hg co
cat foo
Matt Mackall
make manifest friendlier...
r3736 hg manifest --debug
mpm@selenic.com
Fix empty pull bug that appeared this morning...
r522 hg pull
Bryan O'Sullivan
issue 622: pull/unbundle -u updates to default branch if repo was empty
r4931
echo % issue 622
cd ..
hg init empty
cd empty
hg pull -u ../test