view tests/test-issue619 @ 9183:d0225fa2f6c4

do not translate commit messages It is not very helpful to have 'Added tag %s for changeset %s' and similar messages translated into different languages when people work together using different locales. We now use English strings without support for translations. If needed, the user can still supply a custom string for most commands.
author Martin Geisler <mg@lazybytes.net>
date Wed, 22 Jul 2009 22:50:34 +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