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

# Source bundle was generated with the following script.
#
# hg init
# echo a > a
# ln -s a l
# hg ci -Ama -d'0 0'
# mkdir b
# echo a > b/a
# chmod +x b/a
# hg ci -Amb -d'1 0'

hg init
hg -q pull "$TESTDIR/test-manifest.hg"

echo % should be empty
hg manifest

hg co
hg manifest
hg manifest -v
hg manifest --debug
hg manifest -r 0
hg manifest -r 1
hg manifest -r tip

echo % should fail
hg manifest -r 2
hg manifest -r tip tip

hg manifest tip