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

pulling from ../B1

     2

searching for changes

     3

adding changesets

     4

adding manifests

     5

adding file changes

     6

added 1 changesets with 1 changes to 1 files

     7

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

     8

bar should remain deleted.

     9

f405ac83a5611071d6b54dd5eb26943b1fdc4460 644 foo

    10

pulling from ../A2

    11

searching for changes

    12

adding changesets

    13

adding manifests

    14

adding file changes

    15

added 1 changesets with 0 changes to 0 files

    16

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

    17

bar should remain deleted.

    18

f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo