tests/test-merge8
author Christian Ebert <blacktrash@gmx.net>
Wed, 09 Apr 2008 14:12:32 +0200
changeset 6506 850071c017fa
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
keyword: check for '\0' in entire data before acting util.binary might not be safe enough, as it fails eg. on certain pdf files (issue1066).

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