tests/test-merge8
author Martin Geisler <mg@daimi.au.dk>
Sun, 25 Jan 2009 12:33:47 +0100
changeset 7687 1ac4dc64cf2a
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
i18n: sort by file when generating hg.pot This will make the order more stable and give smaller patches when translations merge in new and deleted strings from the hg.pot file.

#!/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