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 201
    • Issues 201
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 1
    • Merge requests 1
  • 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
  • heptapodheptapod
  • heptapodheptapod
  • Merge requests
  • !4

hg-merge: implement a merge on Mercurial side

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Georges Racinet requested to merge topic/heptapod/hg-merge into branch/heptapod Dec 08, 2017
  • Overview 0
  • Commits 1
  • Pipelines 1
  • Changes 2

If a merge is needed (i.e. if the branches are different, or if the heads diverged), a merge changeset is created and published.

Else, the merged changeset is just published.

Edited Dec 08, 2017 by Georges Racinet
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: topic/heptapod/hg-merge