Mercurial > hg

view tests/test-issue619 @ 9574:9e9f63d5c456

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
encoding: fix issue with non-standard UTF-8 CTYPE on OS X
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sat, 10 Oct 2009 12:00:43 +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