view tests/test-issue612 @ 9707:38deec407f8d

run-tests: add "debug" mode: don't capture child output, just show it. In debug mode, we: - don't try to diff expected vs actual output - disallow --interactive - disable timeouts (warn if user tried to supply one) - don't try to parse hghave output, since we don't have the output - don't try to save output to .err file
author Greg Ward <greg-hg@gerg.ca>
date Mon, 02 Nov 2009 17:06:11 -0500
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