view tests/test-issue612 @ 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 9797124581c9
children 4c94b6d0fb1c
line wrap: on
line source

#!/bin/sh

mkdir t
cd t

hg init
mkdir src
echo a > src/a.c
hg ci -Ama -d "10000000 0"

hg mv src source
hg ci -Ammove -d "1000000 0"

hg co -C 0
echo new > src/a.c
echo compiled > src/a.o
hg ci -mupdate -d "1000000 0"

hg st

hg merge

hg st