Skip to content
GitLab
Projects Groups Snippets
  • /
  • 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
  • Merge requests 25
    • Merge requests 25
  • 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

April 05-07 - Mercurial Paris Conference 2023 - One day of workshop dedicated to Heptapod and Mercurial usage and workflow. There are still places available for both workshops and talks!

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

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

  • Review changes

  • Download
  • Email patches
  • Plain diff
Closed Pulkit Goyal requested to merge topic/default/resolved-other-mergestate into branch/default Apr 09, 2020
  • 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
Reviewers
Request review from
Time tracking
Source branch: topic/default/resolved-other-mergestate