Mercurial > hg
view tests/test-diff-unified @ 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.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | d2a917b27152 |
children |
line wrap: on
line source
#!/bin/sh hg init repo cd repo cat > a <<EOF c c a a b a a c c EOF hg ci -Am adda cat > a <<EOF c c a a dd a a c c EOF echo '% default context' hg diff --nodates echo '% invalid --unified' hg diff --nodates -U foo echo '% --unified=2' hg diff --nodates -U 2 echo '% diff.unified=2' hg --config diff.unified=2 diff --nodates echo '% diff.unified=2 --unified=1' hg diff --nodates -U 1 echo '% invalid diff.unified' hg --config diff.unified=foo diff --nodates echo % test off-by-one error with diff -p hg init diffp cd diffp echo a > a hg ci -Ama rm a echo b > a echo a >> a echo c >> a hg diff -U0 -p --nodates exit 0