Mercurial > hg
view tests/test-diff-hashes @ 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 | c2d0ed7f4af8 |
children |
line wrap: on
line source
#!/bin/sh hg init a cd a hg diff not found echo bar > foo hg add foo hg ci -m 'add foo' -d '1000000 0' echo foobar > foo hg ci -m 'change foo' -d '1000001 0' echo 'quiet:' hg --quiet diff -r 0 -r 1 echo echo 'normal:' hg diff -r 0 -r 1 echo echo 'verbose:' hg --verbose diff -r 0 -r 1 echo echo 'debug:' hg --debug diff -r 0 -r 1 echo