Fix long-standing excessive file merges Since switching to the multihead approach, we've been creating excessive file-level merges where files are marked as merged with their ancestors. This explicitly checks at commit time whether the two parent versions are linearly related, and if so, reduces the file check-in to a non-merge. Then the file is compared against the remaining parent, and, if equal, skips check-in of that file (as it's not changed). Since we're not checking in all files that were different between versions, we no longer need to mark so many files for merge. This removes most of the 'm' state marking as well. Finally, it is possible to do a tree-level merge with no file-level changes. This will happen if one user changes file A and another changes file B. Thus, if we have have two parents, we allow commit to proceed even if there are no file-level changes.

     1

#!/bin/sh -e

     2

     3

umask 027

     4

mkdir test1

     5

cd test1

     6

     7

hg init

     8

touch a b

     9

hg add a b

    10

hg ci -m "added a b" -d "0 0"

    11

    12

cd ..

    13

mkdir test2

    14

cd test2

    15

    16

hg init

    17

hg pull ../test1

    18

hg co

    19

chmod +x a

    20

hg ci -m "chmod +x a" -d "0 0"

    21

    22

cd ../test1

    23

echo 123 >>a

    24

hg ci -m "a updated" -d "0 0"

    25

    26

hg pull ../test2

    27

hg heads

    28

hg history

    29

    30

hg -v co -m

    31

    32

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

    33

cut -b 0-10 < foo

    34