tests/test-merge8
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 01 Nov 2006 17:56:55 +0100
changeset 3607 f4c9bb4ad7b1
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
issue352: disallow '\n' and '\r' in filenames (dirstate and manifest)

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