view tests/test-conflict @ 1279:8ab1c07d4e0b

Add checks for programs which are required for the test suite to run. All prerequisite programs are checked for existance, and if any are missing, a list of missing programs is printed, and the test suite is aborted. All programs currently used in the tests, except those in core-utils, are checked.
author eric@localhost.localdomain
date Mon, 19 Sep 2005 18:24:37 -0700
parents 0902ffece4b4
children c71420b186b0
line wrap: on
line source

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "0 0"
echo "something" > a
hg commit -m branch1 -d "0 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "0 0"
HGMERGE=merge; export HGMERGE
hg up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status