view tests/test-username-newline @ 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 foo
cd foo
touch a


unset HGUSER
echo "[ui]" >> .hg/hgrc
echo "username= foo" >> .hg/hgrc
echo "          bar1" >> .hg/hgrc

hg ci -Am m

rm .hg/hgrc

HGUSER=`(echo foo; echo bar2)` hg ci -Am m

hg ci -Am m -u "`(echo foo; echo bar3)`"

true