view tests/test-journal-exists @ 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
echo a > a
hg ci -Am0
hg -q clone . foo

touch .hg/store/journal

echo foo > a
hg ci -Am0

hg recover

echo % check that zero-size journals are correctly aborted
hg bundle -qa repo.hg
chmod -w foo/.hg/store/00changelog.i
hg -R foo unbundle repo.hg 2>&1 | sed 's/\(abort: Permission denied\).*/\1/'
if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi
exit 0