Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • heptapod heptapod
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 191
    • Issues 191
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
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!

  • heptapodheptapod
  • heptapodheptapod
  • Issues
  • #99
Closed
Open
Issue created Oct 02, 2019 by Raphaël Gomès@raphael.gomesMaintainer

Merge request shows up as mergable when it isn't

Summary

Sometimes, the Merge button will be clickable even though the merge will fail.

Steps to reproduce

Have a MR that changes a file that is also changed in the target branch.

What is the current bug behavior?

When clicking the Merge button, merging fails with a message like:

Something went wrong during merge: Could not merge SHAa onto SHAb: n files updated, m files merged, l files removed, p files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon . Refreshing in x seconds to show the updated status... 

What is the expected correct behavior?

It should tell me that the merge is not possible, or allow the merge by using a better merge tool (internally, Heptapod uses the "internal:fail" hg merge tool that is unreasonably strict).

My gut feeling is that the check for merging is still the GitLab one and hasn't been adapted to Mercurial.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking