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

     2

hg --debug init

     3

echo this is a1 > a

     4

hg add a

     5

hg commit -m0 -d "0 0" 

     6

echo this is b1 > b

     7

hg add b

     8

hg commit -m1 -d "0 0" 

     9

hg manifest 1

    10

echo this is c1 > c

    11

hg rawcommit -p 1 -d "0 0" -m2 c

    12

hg manifest 2

    13

hg parents

    14

rm b

    15

hg rawcommit -p 2 -d "0 0" -m3 b

    16

hg manifest 3

    17

hg parents

    18

echo this is a22 > a

    19

hg rawcommit -p 3 -d "0 0" -m4 a

    20

hg manifest 4

    21

hg parents

    22

echo this is c22 > c

    23

hg rawcommit -p 1 -d "0 0" -m5 c

    24

hg manifest 5

    25

hg parents

    26

# merge, but no files changed

    27

hg rawcommit -p 4 -p 5 -d "0 0" -m6

    28

hg manifest 6

    29

hg parents

    30

# no changes what-so-ever

    31

hg rawcommit -p 6 -d "0 0" -m7

    32

hg manifest 7

    33

hg parents