view tests/test-hgweb-descend-empties @ 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
# Test chains of near empty directories, terminating 3 different ways:
# - a1: file at level 4 (deepest)
# - b1: two dirs at level 3
# - e1: file at level 2

echo % Set up the repo
hg init test
cd test
mkdir -p a1/a2/a3/a4
mkdir -p b1/b2/b3/b4
mkdir -p b1/b2/c3/c4
mkdir -p d1/d2/d3/d4
echo foo > a1/a2/a3/a4/foo
echo foo > b1/b2/b3/b4/foo
echo foo > b1/b2/c3/c4/foo
echo foo > d1/d2/d3/d4/foo
echo foo > d1/d2/foo
hg ci -Ama

hg serve -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
cat hg.pid >> $DAEMON_PIDS

echo % manifest with descending
"$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file'

echo % ERRORS ENCOUNTERED
cat errors.log