view tests/test-conflict @ 488:77c66c4eec0e

[PATCH] Set locale before run-tests does anything -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Set locale before run-tests does anything From: Bryan O'Sullivan <bos@serpentine.com> On Mon, 2005-06-27 at 11:58 -0700, Bryan O'Sullivan wrote: > I'm in en_us.UTF-8. This discrepancy between my locale and Matt's broke several tests for me, by the way. I think that the run-tests script should forcibly set the locale to either "C" or "en_us.UTF-8" before it runs anything. Since "C" is likely to be more portable, it's probably the right choice. Here's the patch. manifest hash: 1bf3291eafbde0cdeb1222bb72295c0e2974f236 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwOyVywK+sNU5EO8RAk18AJ4pYmvvJMZfFIR39NqvquXhhWPUTQCcDhhg Ce12AHU8o+m/aFToyRaaQL8= =5nRs -----END PGP SIGNATURE-----
author mpm@selenic.com
date Mon, 27 Jun 2005 22:22:13 -0800
parents ee4c80d294e5
children 3d4d5f2aba9a 4fc63e22b1fe
line wrap: on
line source

#!/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