tests/test-merge8
author Christian Ebert <blacktrash@gmx.net>
Sun, 10 Feb 2008 08:25:09 +0100
changeset 6081 beb775df5630
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
keyword: enable all monkey patches using _kwtemplater at reposetup - no need for try-except block - underscore prefix for private methods - add doc strings

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