tests/test-merge8
author Matt Mackall <mpm@selenic.com>
Sun, 10 Dec 2006 20:08:16 -0600
changeset 3867 d210a1b05cf6
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Added signature for changeset 36a957364b1b89c150f2d0e60a99befe0ee08bd3

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