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

hg init

     4

echo "nothing" > a

     5

hg add a

     6

hg commit -m ancestor -d "0 0"

     7

echo "something" > a

     8

hg commit -m branch1 -d "0 0"

     9

hg co 0

    10

echo "something else" > a

    11

hg commit -m branch2 -d "0 0"

    12

HGMERGE=merge; export HGMERGE

    13

hg up -m 1

    14

hg id

    15

grep -Ev ">>>|<<<" a

    16

hg status