tests/test-merge8
author Sean Dague <sean@dague.net>
Tue, 30 Jan 2007 10:35:25 -0500
changeset 4077 1305ba7dee88
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Prevent type exception on concatenation if diffstat returns None. This will most often occur if diffstat is not installed in the target platform, though may also happen in other cases where diffstat fails to execute. Signed-off-by: Sean Dague <sean@dague.net>

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