tests/test-merge8
author Matt Mackall <mpm@selenic.com>
Thu, 02 Aug 2007 12:29:10 -0500
changeset 5059 8d9bdcbb2b18
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
merge: avoid double deletion mentioned in issue636

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