Mercurial > hg
comparison tests/test-rebase-abort.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 | 527ce85c2e60 |
| children | ff12f42415f5 |
comparison
equal
deleted
inserted
replaced
| 46809:56d441256e82 | 46811:5a0b930cfb3e |
|---|---|
| 93 file: common (state "u") | 93 file: common (state "u") |
| 94 local path: common (hash 94c8c21d08740f5da9eaa38d1f175c592692f0d1, flags "") | 94 local path: common (hash 94c8c21d08740f5da9eaa38d1f175c592692f0d1, flags "") |
| 95 ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6) | 95 ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6) |
| 96 other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5) | 96 other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5) |
| 97 extra: ancestorlinknode = 3163e20567cc93074fbb7a53c8b93312e59dbf2c | 97 extra: ancestorlinknode = 3163e20567cc93074fbb7a53c8b93312e59dbf2c |
| 98 extra: merged = yes | |
| 98 $ hg resolve -l | 99 $ hg resolve -l |
| 99 U common | 100 U common |
| 100 | 101 |
| 101 Insert unsupported mandatory merge record: | 102 Insert unsupported mandatory merge record: |
| 102 | 103 |