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

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update