view tests/test-hgrc @ 9717:68a1b9d0663e

update: allow branch crossing without -c or -C, with no uncommitted changes

Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches.  Minor change to abort message if
uncommitted changes are found.

Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.

#!/bin/sh

mkdir t
cd t
hg init
echo "invalid" > .hg/hgrc
hg status 2>&1 |sed -e "s:/.*\(/t/.*\):...\1:"

#issue 1199, escaping

cd ..
hg init "foo%bar"
hg clone "foo%bar" foobar
p=`pwd`
cd foobar
cat .hg/hgrc |sed -e "s:$p:...:"
hg paths |sed -e "s:$p:...:"
hg showconfig |sed -e "s:$p:...:"

# issue1829: wrong indentation
cd ..
echo '[foo]' >> $HGRCPATH
echo '  x = y' >> $HGRCPATH
hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|"