[PATCH] file seperator handling for the other 'OS' -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] file seperator handling for the other 'OS' From: K Thananchayan <thananck@yahoo.com> The following patch maintains repo root relative source file names in canonical form (with '/' as file seperator). Mercurial calls os.path.join, os.path.normpath, os.path.walk that use platform's file seperator. This patch does not change seperator in these circumstances (except when the result refer to source files). manifest hash: 2fbb4cb0d3d0bc4f4de5c7c8803fb738072ec6c5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNuBywK+sNU5EO8RAhAZAKCV8cz11+rdof9n1tHb0uDScF34GgCeITNi 4aVikToPXqXyReN9kFP5pnY= =xcV5 -----END PGP SIGNATURE-----

     1

#!/bin/bash

     2

     3

export HGMERGE=true

     4

     5

set -ex

     6

mkdir r1

     7

cd r1

     8

hg init

     9

echo a > a

    10

hg addremove

    11

hg commit -t "1" -u test -d "0 0"

    12

    13

cd ..

    14

mkdir r2

    15

cd r2

    16

hg init ../r1

    17

hg up

    18

echo abc > a

    19

hg diff > ../d

    20

sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d

    21

    22

cd ../r1

    23

echo b > b

    24

echo a2 > a

    25

hg addremove

    26

hg commit -t "2" -u test -d "0 0"

    27

    28

cd ../r2

    29

hg -q pull ../r1

    30

hg status

    31

hg -d up

    32

hg -d up -m

    33

hg parents

    34

hg -v history

    35

hg diff > ../d

    36

sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d

    37