view tests/test-issue619 @ 6552:315b36ce6251

mq: add a little documentation on qpush -f
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Wed, 16 Apr 2008 09:35:43 +0200
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