Mercurial > hg
comparison tests/test-rebase-conflicts.t @ 46679:d6fa9fbd375d stable
commit: reorder if-else conditional to give mergestate info priority
Looking at the code now, I was unable to find a good reason as why we only rely
on mergestate extras info after checking whether a filelog parent is ancestor of
other or not.
I mean if we have stored in mergestate that `other` was chosed, we should
blindly pick that one.
This cleanup will also help introduce more cases when both `fparent1` and
`fparent2` are non-null but using info from mergestate, we can fastpath.
The test change actually demonstrates the point of the patch. During merge we
were getting the other side of the file but on commit we were marking that as
merged.
Differential Revision: https://phab.mercurial-scm.org/D10147
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 04 Mar 2021 17:35:58 +0530 |
| parents | fa87536d3d70 |
| children | e2f7b2695ba1 |
comparison
equal
deleted
inserted
replaced
| 46678:0d055849d5f9 | 46679:d6fa9fbd375d |
|---|---|
| 274 committing files: | 274 committing files: |
| 275 f1.txt | 275 f1.txt |
| 276 committing manifest | 276 committing manifest |
| 277 committing changelog | 277 committing changelog |
| 278 updating the branch cache | 278 updating the branch cache |
| 279 rebased as 2a7f09cac94c | 279 rebased as c1ffa3b5274e |
| 280 rebase status stored | 280 rebase status stored |
| 281 rebase merging completed | 281 rebase merging completed |
| 282 update back to initial working directory parent | 282 update back to initial working directory parent |
| 283 resolving manifests | 283 resolving manifests |
| 284 branchmerge: False, force: False, partial: False | 284 branchmerge: False, force: False, partial: False |
| 285 ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0 | 285 ancestor: c1ffa3b5274e, local: c1ffa3b5274e+, remote: d79e2059b5c0 |
| 286 f1.txt: other deleted -> r | 286 f1.txt: other deleted -> r |
| 287 removing f1.txt | 287 removing f1.txt |
| 288 f2.txt: remote created -> g | 288 f2.txt: remote created -> g |
| 289 getting f2.txt | 289 getting f2.txt |
| 290 2 changesets found | 290 2 changesets found |
| 298 saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg | 298 saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg |
| 299 3 changesets found | 299 3 changesets found |
| 300 list of changesets: | 300 list of changesets: |
| 301 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c | 301 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c |
| 302 19c888675e133ab5dff84516926a65672eaf04d9 | 302 19c888675e133ab5dff84516926a65672eaf04d9 |
| 303 2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf | 303 c1ffa3b5274e92a9388fe782854e295d2e8d0443 |
| 304 bundle2-output-bundle: "HG20", 3 parts total | 304 bundle2-output-bundle: "HG20", 3 parts total |
| 305 bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload | 305 bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
| 306 bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload | 306 bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload |
| 307 bundle2-output-part: "phase-heads" 24 bytes payload | 307 bundle2-output-part: "phase-heads" 24 bytes payload |
| 308 adding branch | 308 adding branch |
| 309 bundle2-input-bundle: with-transaction | 309 bundle2-input-bundle: with-transaction |
| 310 bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported | 310 bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported |
| 311 adding changesets | 311 adding changesets |
| 312 add changeset 4c9fbe56a16f | 312 add changeset 4c9fbe56a16f |
| 313 add changeset 19c888675e13 | 313 add changeset 19c888675e13 |
| 314 add changeset 2a7f09cac94c | 314 add changeset c1ffa3b5274e |
| 315 adding manifests | 315 adding manifests |
| 316 adding file changes | 316 adding file changes |
| 317 adding f1.txt revisions | 317 adding f1.txt revisions |
| 318 bundle2-input-part: total payload size 1686 | 318 bundle2-input-part: total payload size 1686 |
| 319 bundle2-input-part: "cache:rev-branch-cache" (advisory) supported | 319 bundle2-input-part: "cache:rev-branch-cache" (advisory) supported |