mergestate: store about files resolved in favour of other Committing a merge sometimes wrongly creates a new filenode where it can re-use an existing one. This happens because the commit code does it's own calculation and does not know what happened on merge. This starts storing information in mergestate about files which were automatically merged and the other/remote version of file was used. We need this information at commit to pick the filenode parent for the new commit. This issue was found by Pierre-Yves David and idea to store the relevant parts in mergestate is also suggested by him. Somethings which can be further investigated are: 1) refactoring of commit logic more to depend on this information 2) maybe a more generic solution? Differential Revision: https://phab.mercurial-scm.org/D8392

     1

https://bz.mercurial-scm.org/612

     2

     3

  $ hg init

     4

  $ mkdir src

     5

  $ echo a > src/a.c

     6

  $ hg ci -Ama

     7

  adding src/a.c

     8

     9

  $ hg mv src source

    10

  moving src/a.c to source/a.c

    11

    12

  $ hg ci -Ammove

    13

    14

  $ hg co -C 0

    15

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

    16

    17

  $ echo new > src/a.c

    18

  $ echo compiled > src/a.o

    19

  $ hg ci -mupdate

    20

  created new head

    21

    22

  $ hg status

    23

  ? src/a.o

    24

    25

  $ hg merge

    26

  merging src/a.c and source/a.c to source/a.c

    27

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

    28

  (branch merge, don't forget to commit)

    29

    30

  $ hg status

    31

  M source/a.c

    32

  R src/a.c

    33

  ? src/a.o

    34