view tests/test-issue619 @ 7725:6a888d491eaf

coal/paper: switch to XHTML 1.1
author Benoit Allard <benoit@aeteurope.nl>
date Thu, 05 Feb 2009 18:15:33 +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