view tests/test-merge8 @ 12028:21984c1c83d4 stable

test-dispatch: drop test for missing working directory hstuart reported problems when the local Python has been configured to do stuff and crash before reaching the expected error handler.
author Mads Kiilerich <mads@kiilerich.com>
date Mon, 23 Aug 2010 22:32:36 +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