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

checkout

     2

2 files updated, 0 files merged, 2 files removed, 0 files unresolved

     3

merge

     4

resolving manifests

     5

 overwrite None partial False

     6

 ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2

     7

 a: remote moved to b -> m

     8

 b2: remote created -> g

     9

merging a and b

    10

my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c

    11

copying a to b

    12

removing a

    13

getting b2

    14

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

    15

(branch merge, don't forget to commit)

    16

M b

    17

  a

    18

M b2

    19

R a

    20

C c2

    21

blahblah

    22

   rev    offset  length   base linkrev nodeid       p1           p2

    23

     0         0      67      0       1 dc51707dfc98 000000000000 000000000000

    24

     1        67      72      1       3 b2494a44f0a9 000000000000 dc51707dfc98

    25

b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66