tests/test-conflict
author Matt Mackall <mpm@selenic.com>
Fri, 19 Oct 2007 12:53:43 -0500
changeset 5470 8374f3f081f2
parent 4385 93a4e72b4f83
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

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status