Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1 @ 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 | 5b22029b5aa2 |
children | 7e4843b7efd2 |
line wrap: on
line source
#!/bin/sh -x cat <<'EOF' > merge #!/bin/sh echo merging for `basename $1` EOF chmod +x merge mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user hg update 0 echo This is file c1 > c hg add c hg commit -t "commit #2" -d "0 0" -u user echo This is file b1 > b env HGMERGE=../merge hg update -m 1 # no merges expected cd ..; /bin/rm -rf t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user hg update 0 echo This is file c1 > c hg add c hg commit -t "commit #2" -d "0 0" -u user echo This is file b2 > b env HGMERGE=../merge hg update -m 1 # merge of b expected cd ..; /bin/rm -rf t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user echo This is file b22 > b hg commit -t "commit #2" -d "0 0" -u user hg update 1 echo This is file c1 > c hg add c hg commit -t "commit #3" -d "0 0" -u user cat b echo This is file b22 > b env HGMERGE=../merge hg update -m 2 # merge expected! cd ..; /bin/rm -rf t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -t "commit #0" -d "0 0" -u user echo This is file b1 > b hg add b hg commit -t "commit #1" -d "0 0" -u user echo This is file b22 > b hg commit -t "commit #2" -d "0 0" -u user hg update 1 echo This is file c1 > c hg add c hg commit -t "commit #3" -d "0 0" -u user echo This is file b33 > b env HGMERGE=../merge hg update -m 2 # merge of b expected cd ..; /bin/rm -rf t