Skip to content
  • Georges Racinet's avatar
    Mercurial implementation of the fast-forward merge method · ee9dd0963a32
    Georges Racinet authored
    Closes #142
    
    This translates pretty much into `hg phase -p`.
    
    Most safeguards are been done by GitLab before this low-level method is
    called, but we still have to add our own: we don't want to publish
    a changeset from another branch (nor accept this if the target GitLab
    branch doesn't correspond to a Mercurial named branch).
    
    Note for the future: the `with_branch` method will move the Git
    branch once the closure is done. That was why we had to avoid sending
    Git hooks there and in the other merge method.
    ee9dd0963a32