Respect locale environment variables on darwin. In python 2.4+ on darwin, locale.getpreferredencoding() returns mac-roman regardless of what LC_CTYPE, LANG etc are set to. This can produce hard-to-notice conversion errors if input text is not in mac-roman. So this patch overrides it with setlocale/getlocale if the environment has been customized, on the assumption that the user has done so deliberately.

     1

#!/bin/sh

     2

# a test for issue586

     3

     4

hg init a

     5

cd a

     6

echo a > a

     7

hg ci -Ama

     8

     9

hg init ../b

    10

cd ../b

    11

echo b > b

    12

hg ci -Amb

    13

    14

hg pull -f ../a

    15

hg merge

    16

hg rm -f a

    17

hg ci -Amc

    18

    19

hg st -A