view tests/test-issue619 @ 6383:38485d45f947

run-tests.py: Only one fail message when output changed and error code. This fixes passing back fail messages mistaken for skip messages when running with parallel jobs because run_children() only expects one message per fail.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 24 Mar 2008 22:09:01 +0100
parents 8808ea7da86b
children 4c94b6d0fb1c
line wrap: on
line source

#!/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