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

HGMERGE(1)

     2

==========

     3

Matt Mackall <mpm@selenic.com>

     4

v0.1, 27 May 2005

     5

     6

NAME

     7

----

     8

hgmerge - default wrapper to merge files in Mercurial SCM system

     9

    10

SYNOPSIS

    11

--------

    12

'hgmerge' local ancestor remote

    13

    14

DESCRIPTION

    15

-----------

    16

The hgmerge(1) command provides a graphical interface to merge files in the

    17

Mercurial system. It is a simple wrapper around kdiff3, merge(1) and tkdiff(1),

    18

or simply diff(1) and patch(1) depending on what is present on the system.

    19

    20

hgmerge(1) is used by the Mercurial SCM if the environment variable HGMERGE is

    21

not set.

    22

    23

AUTHOR

    24

------

    25

Written by Vincent Danjean <Vincent.Danjean@free.fr>

    26

    27

SEE ALSO

    28

--------

    29

hg(1) - the command line interface to Mercurial SCM

    30

    31

COPYING

    32

-------

    33

Copyright \(C) 2005, 2006 Matt Mackall.

    34

Free use of this software is granted under the terms of the GNU General

    35

Public License (GPL).