view tests/test-revlog-group-emptyiter @ 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

# issue 1678

echo "# -- setting up base repo"
hg init a
cd a
touch a
hg ci -Am a
cd ..

echo "# -- cloning base repo"
hg clone a b
cd b

echo "# -- setting up cset to push"
hg up null
touch a
hg ci -Am b # different msg so we get a clog new entry

echo "# -- pushing"
hg push -f ../a