view tests/test-issue619 @ 5443:58496354773f

Merge with crew Those crew folks are getting lazy about pulling from upstream before committing.
author Matt Mackall <mpm@selenic.com>
date Thu, 11 Oct 2007 00:46:40 -0500
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