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

changeset:   0:acb14030fe0a

     2

tag:         tip

     3

user:        test

     4

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

     5

summary:     test

     6

     7

changeset:   1:863197ef0378

     8

tag:         tip

     9

user:        test

    10

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

    11

summary:     Added tag bleah for changeset acb14030fe0a21b60322c440ad2d20cf7685a376

    12

    13

changeset:   0:acb14030fe0a

    14

tag:         bleah

    15

user:        test

    16

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

    17

summary:     test

    18

    19

abort: working copy of .hgtags is changed!

    20

(please commit .hgtags manually)

    21

failed