tests/test-issue619
author Matt Mackall <mpm@selenic.com>
Fri, 19 Oct 2007 12:53:43 -0500
changeset 5470 8374f3f081f2
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
tests: tidy up reporting of skipped tests if not verbose: - print 's' rather than '.' - pass skipped test reports back to parent for -j - report which tests were skipped at the end - print '.' after test completion

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg ci -Ama -d '1000000000 0'
echo b > b
hg branch b
hg ci -Amb -d '1000000000 0'
hg co -C 0

echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'

echo bogus fast-forward should fail
hg merge b

echo done