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 "another line of text" >> file1

     8

echo "added file2" > file2

     9

hg add file1 file2

    10

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

    11

echo "changed file1" >> file1

    12

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

    13

hg -q log

    14

hg id

    15

hg update -C 0

    16

hg id

    17

echo "changed file1" >> file1

    18

hg id

    19

hg revert

    20

hg diff

    21

hg status

    22

hg id

    23

hg update

    24

hg diff

    25

hg status

    26

hg id

    27

hg update -C 0

    28

echo "changed file1 different" >> file1

    29

HGMERGE=merge hg update

    30

hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\) .*/\1/" \

    31

              -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/"

    32

hg status

    33

hg id

    34

hg revert

    35

hg diff

    36

hg status

    37

hg id

    38

hg revert -r tip

    39

hg diff

    40

hg status

    41

hg id

    42

hg update -C

    43

hg diff

    44

hg status

    45

hg id

    46

cd ..; /bin/rm -rf t

    47