view tests/test-cat @ 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 0 > a
echo 0 > b
hg ci -A -m m -d "1000000 0"
hg rm a
hg cat a
hg cat --decode a # more tests in test-encode
echo 1 > b
hg ci -m m -d "1000000 0"
echo 2 > b
hg cat -r 0 a
hg cat -r 0 b
hg cat -r 1 a
hg cat -r 1 b