tests/test-merge8
author Christian Ebert <blacktrash@gmx.net>
Sat, 12 Jul 2008 19:12:10 +0100
changeset 7115 c5c2d43b01da
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
patchbomb: mime-encode headers and parts not containing patches Do nothing for "hg email --test" to preserve display.

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