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

"$TESTDIR/hghave" execbit || exit 80

hg init repo
cd repo
echo foo > foo
chmod 644 foo
hg ci -qAm '644'

chmod 755 foo
hg ci -qAm '755'

echo '% reverting to rev 0'
hg revert -a -r 0
hg st
hg diff --git