view tests/test-diff-binary-file @ 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 a
cd a
cp $TESTDIR/binfile.bin .
hg add binfile.bin
hg ci -m 'add binfile.bin'

echo >> binfile.bin
hg ci -m 'change binfile.bin'

hg revert -r 0 binfile.bin
hg ci -m 'revert binfile.bin'

echo % diff -r 0 -r 1
hg diff --nodates -r 0 -r 1

echo % diff -r 0 -r 2
hg diff --nodates -r 0 -r 2

echo % diff --git -r 0 -r 1
hg diff --git -r 0 -r 1

echo % diff --git -r 0 -r 2
hg diff --git -r 0 -r 2