view tests/test-issue1175 @ 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
rm -rf a
hg init a
cd a
touch a
hg ci -Am0
hg mv a a1
hg ci -m1
hg co 0
hg mv a a2
hg up
hg ci -m2

touch a
hg ci -Am3
hg mv a b
hg ci -Am4 a
hg ci --debug --traceback -Am5 b
hg verify
hg export --git tip