view tests/test-586 @ 7425:14ed6662af48

tests: disable test-convert-darcs properly for darcs 2 The x bit was disabled without notice in 8046f0a070a6
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 23 Nov 2008 20:16:29 +0100
parents 720ae5085ee3
children f1af59451c0c
line wrap: on
line source

#!/bin/sh
# a test for issue586

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc

hg st -A