view tests/test-encode @ 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

hg init

cat > .hg/hgrc <<EOF
[encode]
*.gz = gzip -d

[decode]
*.gz = gzip

EOF

echo "this is a test" | gzip > a.gz
hg add a.gz
hg ci -m "test" -d "1000000 0"
echo %% no changes
hg status
touch a.gz

echo %% no changes
hg status

echo %% uncompressed contents in repo
hg debugdata .hg/store/data/a.gz.d 0

echo %% uncompress our working dir copy
gunzip < a.gz

rm a.gz
hg co -C

echo %% uncompress our new working dir copy
gunzip < a.gz

echo %% check hg cat operation
hg cat a.gz
hg cat --decode a.gz | gunzip
mkdir subdir
cd subdir
hg -R .. cat ../a.gz
hg -R .. cat --decode ../a.gz | gunzip