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

     3

mkdir t

     4

cd t

     5

hg init

     6

echo "added file1" > file1

     7

echo "added file2" > file2

     8

hg add file1 file2

     9

hg commit -m "added file1 and file2" -d "0 0" -u user

    10

echo "changed file1" >> file1

    11

hg commit -m "changed file1" -d "0 0" -u user

    12

hg -q log

    13

hg id

    14

hg update -C 0

    15

hg id

    16

echo "changed file1" >> file1

    17

hg id

    18

hg revert

    19

hg diff

    20

hg status

    21

hg id

    22

hg update

    23

hg diff

    24

hg status

    25

hg id

    26

hg update -C 0

    27

echo "changed file1" >> file1

    28

HGMERGE=merge hg update

    29

hg diff

    30

hg status

    31

hg id

    32

hg revert

    33

hg diff

    34

hg status

    35

hg id

    36

hg revert -r tip

    37

hg diff

    38

hg status

    39

hg id

    40

hg update -C

    41

hg diff

    42

hg status

    43

hg id

    44

cd ..; /bin/rm -rf t

    45