tests/test-merge8
author Peter Meerwald <pmeerw@pmeerw.net>
Fri, 17 Aug 2007 22:43:38 -0300
changeset 5193 942c0827dc5b
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
recognize user:password in URLs that include port numbers. when giving user/pwd in an URL, eg. hg pull http://user:pwd@host.com:666/hg/something, hg would still ask for user/pwd in interactive mode (or fail in non-interactive)

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update