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

checking changesets

     2

checking manifests

     3

crosschecking files in changesets and manifests

     4

checking files

     5

1 files, 1 changesets, 1 total revisions

     6

changeset:   0:acb14030fe0a

     7

tag:         tip

     8

user:        test

     9

date:        Thu Jan  1 00:00:00 1970 +0000

    10

summary:     test

    11

    12

rolling back last transaction

    13

checking changesets

    14

checking manifests

    15

crosschecking files in changesets and manifests

    16

checking files

    17

0 files, 0 changesets, 0 total revisions

    18

A a