Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Register
  • Sign in
  • mercurial-devel mercurial-devel
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Merge requests 27
    • Merge requests 27
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar

Due to a massive storm of spam, registration on this instance now requires explicit administrator approval. Sorry for the added friction, we're also looking into automatic filtering options.

  • mercurialmercurial
  • mercurial-develmercurial-devel
  • Merge requests
  • !76

commit: reorder if-else conditional to give mergestate info priority

  • Review changes

  • Download
  • Patches
  • Plain diff
Closed Pulkit Goyal requested to merge topic/default/merge-copies-fix-attempt-ready into branch/default Mar 09, 2021
  • Overview 0
  • Commits 5
  • Pipelines 10
  • Changes 11

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.

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: topic/default/merge-copies-fix-attempt-ready