From: Andrew Thompson <andrewkt@aktzero.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 From: Andrew Thompson <andrewkt@aktzero.com> Make a local temporary install of hg for running tests Delete old error files before running tests manifest hash: bbae21d506ce5be8df5dc97f14fcd0f8aece0b20 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuLyQywK+sNU5EO8RAvROAJ93xEPZNphcpoLxGCMNkZ7SfL6+AQCfXCHZ 3kMQAuZnxo0dn98of/LVecY= =bsV2 -----END PGP SIGNATURE-----

#!/bin/bash

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