Mercurial > hg
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
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 10 Mar 2021 13:14:32 +0530 |
parents | 41d695a08e90 |
children | 84a93fa7ecfd |
comparison
equal
deleted
inserted
replaced
46809:56d441256e82 | 46811:5a0b930cfb3e |
---|---|
1842 file: file (state "u") | 1842 file: file (state "u") |
1843 local path: file (hash 971c419dd609331343dee105fffd0f4608dc0bf2, flags "") | 1843 local path: file (hash 971c419dd609331343dee105fffd0f4608dc0bf2, flags "") |
1844 ancestor path: file (node bc7ebe2d260cff30d2a39a130d84add36216f791) | 1844 ancestor path: file (node bc7ebe2d260cff30d2a39a130d84add36216f791) |
1845 other path: file (node b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3) | 1845 other path: file (node b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3) |
1846 extra: ancestorlinknode = b73b8c9a4ab4da89a5a35a6f10dfb13edc84ca37 | 1846 extra: ancestorlinknode = b73b8c9a4ab4da89a5a35a6f10dfb13edc84ca37 |
1847 extra: merged = yes | |
1847 We should be able to see the log (without the deleted commit, of course) | 1848 We should be able to see the log (without the deleted commit, of course) |
1848 $ hg log -G | 1849 $ hg log -G |
1849 @ 0:f53e9479dce5 (draft) [tip ] first | 1850 @ 0:f53e9479dce5 (draft) [tip ] first |
1850 | 1851 |
1851 $ cd .. | 1852 $ cd .. |