[PATCH]: Typo in localrepository.update -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH]: Typo in localrepository.update From: Goffredo Baroncelli <kreijack@libero.it> I think that there is an error in the method update() of the class localrepository. The variable 'm2n' was used instead of 'man'; so the parent2 flags is computed instead of the ancestor flags. manifest hash: dc11810367615245c4b39660d135ab3c0e71b85d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNWpywK+sNU5EO8RAv9ZAKCxwbd242xZQ1CCrW2WDdQ4gclKtACghXYl 7j1YTRpINItwdXzak3cBS60= =+Tf8 -----END PGP SIGNATURE-----

     1

#!/bin/sh +ex

     2

     3

mkdir test1

     4

cd test1

     5

     6

hg init

     7

touch a b

     8

hg add a b

     9

hg ci -t "added a b" -u test -d "0 0"

    10

    11

cd ..

    12

mkdir test2

    13

cd test2

    14

    15

hg init

    16

hg merge ../test1

    17

hg co

    18

chmod +x a

    19

hg ci -t "chmod +x a" -u test -d "0 0"

    20

    21

cd ../test1

    22

echo 123 >>a

    23

hg ci -t "a updated" -u test -d "0 0"

    24

    25

ls -l ../test[12]/a

    26

    27

hg merge ../test2

    28

hg heads

    29

hg history

    30

    31

hg -dv co -m

    32

    33

ls -l ../test[12]/a > foo

    34

cut -b 0-10 < foo

    35