Skip to content

GitLab

  • Menu
Projects Groups Snippets
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • mercurial-devel-native-test mercurial-devel-native-test
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 12
    • Issues 12
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 22
    • Merge requests 22
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • heptapod
  • Testing Projects
  • mercurial-devel-native-testmercurial-devel-native-test
  • Merge requests
  • !76

Closed
Created Mar 09, 2021 by Raphaël Gomès@raphael.gomesMaintainer
  • Report abuse
Report abuse

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

  • Overview 0
  • Commits 5
  • Pipelines 1
  • 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
Reviewer
Request review from
Time tracking
Source branch: topic/default/merge-copies-fix-attempt-ready