[PATCH] Get run-tests working on 64-bit machines. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Get run-tests working on 64-bit machines. From: Bryan O'Sullivan <bos@serpentine.com> manifest hash: 3704997be1744478414cddcd79c7bea5ccd6a1b1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvfdvywK+sNU5EO8RAm5iAJ9mWxI4o2j7IM7Mko7IjfKfNtWJqwCcDekn 6GDlcDo/Q3nv8ybFzykwQjY= =tS2i -----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