view tests/test-issue619 @ 5839:59fba5caa94b

Don't use the -i option with sed This patch fixes test-keyword on platforms without GNU sed (like OpenBSD).
author Will Maier <willmaier@ml1.net>
date Wed, 09 Jan 2008 10:00:18 -0600
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