BitBucket + hg + branch merges

Ever have to update/merge a PR on BitBucket with Mercurial? I couldn't find documentation anywhere, so doing so here:

  1. hg up BOOKMARK_NAME
  2. hg merge [--preview] -r REV
  3. If EDITOR is not set:
    export EDITOR=vim
  4. hg resolve --all
  5. hg commit -m "Merge with default"
  6. hg push --allow-anon

    Write a Reply or Comment

    Your email address will not be published.


    You may use these HTML tags and attributes: <a href="" title=""> <abbr title=""> <acronym title=""> <b> <blockquote cite=""> <cite> <code> <del datetime=""> <em> <i> <q cite=""> <s> <strike> <strong>