view tests/test-merge8 @ 10025:fb45c1e4396f stable

cmdutil: copy auth section in remoteui This allows me to specify an auth section in a .hg/hgrc instead of just a global or user-level hgrc.
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 10 Dec 2009 12:31:21 +0100
parents efbe24c7d8d9
children
line wrap: on
line source

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