view tests/test-merge-revert @ 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 "added file1" > file1
echo "added file2" > file2
hg add file1 file2
hg commit -m "added file1 and file2" -d "1000000 0" -u user
echo "changed file1" >> file1
hg commit -m "changed file1" -d "1000000 0" -u user
hg -q log
hg id
hg update -C 0
hg id
echo "changed file1" >> file1
hg id
hg revert --all
hg diff
hg status
hg id
hg update
hg diff
hg status
hg id
hg update -C 0
echo "changed file1" >> file1
hg update
hg diff
hg status
hg id
hg revert --all
hg diff
hg status
hg id
hg revert -r tip --all
hg diff
hg status
hg id
hg update -C
hg diff
hg status
hg id