view tests/test-merge8 @ 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 efbe24c7d8d9
children
line wrap: on
line source

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update