Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • mercurial-devel mercurial-devel
  • 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 7
    • Merge requests 7
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar

This instance was upgraded to Heptapod 0.31.0 (final) today.

  • mercurial
  • mercurial-develmercurial-devel
  • Merge requests
  • !30

Closed
Created Apr 09, 2020 by Pulkit Goyal@pulkit.goyalMaintainer
  • Report abuse
Report abuse

[RFC] mergestate: store about files resolved in favour of other

  • Overview 0
  • Commits 1
  • Pipelines 4
  • Changes 5

This starts storing information in mergestate about files which were automatically merged and the other/remote version of file was used. We need this information at commit to pick the filenode parent for the new commit. The commit code has weird filenode resolution here which does not depend on what merge did and rely on some file ancestry logic. That leads to problem in some cases, the tests which are changed by this patch.

Somethings which can be investigated after above 3 are done:

  1. refactoring of commit logic more to depend on this information

  2. maybe a more generic solution?

Edited Apr 10, 2020 by Pulkit Goyal
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: topic/default/resolved-other-mergestate