Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
evolve
evolve
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Merge Requests 28
    • Merge Requests 28
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Environments
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Jobs
  • Commits

This instance will be upgraded to Heptapod 0.19.0rc2 on 2021-01-18 at 11:00 UTC+1 (a few minutes of downtime)

  • mercurial
  • evolveevolve
  • Merge Requests
  • !243

Open
Opened Sep 16, 2020 by Pulkit Goyal@pulkit.goyalDeveloper
  • Report abuse
Report abuse

evolvecmd: clear mergestate ourselves in _resolvephasedivergent()

  • Overview 4
  • Commits 1
  • Pipelines 3
  • Changes 1

repo.commitctx() does not clear the mergestate. We need to clear the mergestate ourselves here.

The issue poped up when we started having mergestate with extras and no conflicted files. Storage of these extras was recently added to mergestate.

Assignee
Assign to
Reviewer
Request review from
None
Milestone
None
Assign milestone
Time tracking
Reference: mercurial/evolve!243
Source branch: topic/default/clear-ms