tests/test-merge8
author Matt Mackall <mpm@selenic.com>
Sat, 09 Dec 2006 12:46:01 -0600
changeset 3843 abaa2cd00d2b
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
make transcoding more robust default to ASCII abort if unknown encoding wrap abort strings with _ add test

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