tests/test-issue619
author Alex Unden <alu@zpuppet.org>
Fri, 27 Feb 2009 02:01:45 -0800
changeset 7817 cb516e788238
parent 4748 8808ea7da86b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set

#!/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