view tests/test-issue619 @ 5465:9873cbb134b2

mercurial.el, mq.el: remove runtime dependencies on CL package * (require 'cl) at compile-time * don't use map()
author NIIMI Satoshi <sa2c@sa2c.net>
date Thu, 11 Oct 2007 05:58:54 +0900
parents 8808ea7da86b
children
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