view tests/test-diff-copy-depth @ 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

for i in aaa zzz; do
    hg init t
    cd t

    echo "-- With $i"

    touch file
    hg add file
    hg ci -m "Add"

    hg cp file $i
    hg ci -m "a -> $i"

    hg cp $i other-file
    echo "different" >> $i
    hg ci -m "$i -> other-file"

    hg cp other-file somename

    echo "Status":
    hg st -C
    echo
    echo "Diff:"
    hg diff -g
    echo

    cd ..
    rm -rf t
done