view tests/test-merge8 @ 3873:a41b01a3c29f

Fix test output for test-mq-guards (changed by 22d18051f9e5)
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 12 Dec 2006 19:11:01 +0100
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