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

requesting all changes

     8

adding changesets

     9

adding manifests

    10

adding file changes

    11

added 1 changesets with 1 changes to 1 files

    12

checking changesets

    13

checking manifests

    14

crosschecking files in changesets and manifests

    15

checking files

    16

1 files, 1 changesets, 1 total revisions

    17

foo

    18

2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo

    19

pulling from http://localhost:20059/

    20

searching for changes

    21

no changes found

    22

killed!