tests/test-merge8
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 08 Dec 2006 22:01:05 -0200
changeset 3835 d1ce5461beed
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Allow the user to specify the fallback encoding for the changelog Example: use EUC-JP instead of ISO-8859-1: [ui] fallbackencoding = EUC-JP

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