view tests/test-issue619 @ 6241:a718e66836e8

setup.py: os.uname is not available on Windows
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 12 Mar 2008 15:33:43 -0700
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