Avoid extra filelogs entries. Right now, there are some situations in which localrepo.filecommit can create filelog entries even though they're not needed. For example: - permissions for a file have changed; - qrefresh can create a filelog entry identical to its parent (see the added test); - convert-repo creates extra filelog entries in every merge where the first parent has added files (for example, changeset ebebe9577a1a of the kernel repo added extra filelog entries to files in the arch/blackfin directory, even though the merge should only touch the drivers/ata directory). This makes "hg log file" in a converted repo less useful than it could be, since it may mention many merges that don't actually touch that specific file. They all come from the same basic problem: localrepo.commit (through filecommit) creates new filelog entries for all files passed to it (except for some cases during a merge). Patch and test case provided by Benoit. This should fix issue351.

     1

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

     2

warning: conflicts during merge.

     3

merging a

     4

merging a failed!

     5

0 files updated, 0 files merged, 0 files removed, 1 files unresolved

     6

There are unresolved merges, you can redo the full merge using:

     7

  hg update -C 2

     8

  hg merge 1

     9

e7fe8eb3e180+0d24b7662d3e+ tip

    10

<<<<<<< my

    11

something else

    12

=======

    13

something

    14

>>>>>>> other

    15

M a