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

# In the merge below, the file "foo" has the same contents in both
# parents, but if we look at the file-level history, we'll notice that
# the version in p1 is an ancestor of the version in p2.  This test
# makes sure that we'll use the version from p2 in the manifest of the
# merge revision.

hg init repo
cd repo

echo foo > foo
hg ci -qAm 'add foo'

echo bar >> foo
hg ci -m 'change foo'

hg backout -r tip -m 'backout changed foo'

hg up -C 0
touch bar
hg ci -qAm 'add bar'

hg merge --debug
hg debugstate | grep foo
hg st -A foo
hg ci -m 'merge'

hg manifest --debug | grep foo
hg debugindex .hg/store/data/foo.i