view tests/test-issue619 @ 11938:b8b1e6e78486

mq/qqueue: split _setactive Prepare _setactive to be called without checking for applied patches.
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
date Sun, 15 Aug 2010 16:48:08 +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