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

adding foo

     2

checking changesets

     3

checking manifests

     4

crosschecking files in changesets and manifests

     5

checking files

     6

1 files, 1 changesets, 1 total revisions

     7

pulling from ../branch

     8

searching for changes

     9

adding changesets

    10

adding manifests

    11

adding file changes

    12

added 1 changesets with 1 changes to 1 files

    13

(run 'hg update' to get a working copy)

    14

checking changesets

    15

checking manifests

    16

crosschecking files in changesets and manifests

    17

checking files

    18

1 files, 2 changesets, 2 total revisions

    19

foo

    20

bar

    21

6f4310b00b9a147241b071a60c28a650827fb03d 644 foo