view tests/test-merge8 @ 3560:09d99b7e4da0

simplify dirstate walking - kill walkhelper - stop passing dc around - remove unused stat arg from statmatch (renamed imatch)
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Oct 2006 23:54:24 -0500
parents efbe24c7d8d9
children
line wrap: on
line source

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