[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

+ hg init

     2

+ echo nothing

     3

+ hg add a

     4

+ hg commit -t ancestor -u test -d '0 0'

     5

+ echo something

     6

+ hg commit -t branch1 -u test -d '0 0'

     7

+ hg co 0

     8

+ echo 'something else'

     9

+ hg commit -t branch2 -u test -d '0 0'

    10

+ export HGMERGE=merge

    11

+ HGMERGE=merge

    12

+ hg -d up -m 1

    13

merge: warning: conflicts during merge

    14

resolving manifests

    15

 ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc

    16

 a versions differ, resolve

    17

working dir created .out, keeping

    18

merging a

    19

resolving a

    20

file a: other d7250518cb1b ancestor 68ba9db7a9e4

    21

merging a failed!

    22

+ hg id

    23

32e80765d7fe+75234512624c+ tip

    24

+ grep -Ev '>>>|<<<' a

    25

something else

    26

=======

    27

something

    28

+ hg status

    29

C a

    30

? .out