view tests/test-merge8 @ 5148:a04694e08775

merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 11 Aug 2007 13:35:25 +0200
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