view tests/test-issue619 @ 5941:b710296c904a

Update usage message in test-glog.out AKA: Remind Thomas to run tests even after trivial changes.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 25 Jan 2008 21:09:14 +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