comparison tests/test-obsolete.t @ 46811:5a0b930cfb3e

commit: get info from mergestate whether a file was merged or not

While commiting a merge, the commit code does not know whether a file was merged
during `hg merge` or not. This leads the commit code to look for filelog
ancestor to choose parents of new filelog created on merge commit.
This leads to wrong results in some cases as demonstrated by previous patch.

From this patch, we start storing information about merged files in mergestate
in stateextras and then use that on commit to detect whether we need to set two
parents or not.

Differential Revision: https://phab.mercurial-scm.org/D10149

46809:56d441256e82

  file: file (state "u")
    local path: file (hash 971c419dd609331343dee105fffd0f4608dc0bf2, flags "")
    ancestor path: file (node bc7ebe2d260cff30d2a39a130d84add36216f791)
    other path: file (node b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3)
    extra: ancestorlinknode = b73b8c9a4ab4da89a5a35a6f10dfb13edc84ca37
We should be able to see the log (without the deleted commit, of course)
  $ hg log -G
  @  0:f53e9479dce5 (draft) [tip ] first
  
  $ cd ..

46811:5a0b930cfb3e

  file: file (state "u")
    local path: file (hash 971c419dd609331343dee105fffd0f4608dc0bf2, flags "")
    ancestor path: file (node bc7ebe2d260cff30d2a39a130d84add36216f791)
    other path: file (node b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3)
    extra: ancestorlinknode = b73b8c9a4ab4da89a5a35a6f10dfb13edc84ca37
    extra: merged = yes
We should be able to see the log (without the deleted commit, of course)
  $ hg log -G
  @  0:f53e9479dce5 (draft) [tip ] first
  
  $ cd ..