title: How to undo "abort: push creates new remote heads on branch" in mercurial
body: <p>I am aware of <a href="https://stackoverflow.com/questions/1170338/mercurial-for-beginners-the-definitive-practical-guide/">Mercurial for Beginners: The Definitive Practical Guide</a> and answers like <a href="https://stackoverflow.com/questions/7448405/mercurial-merge-branches-abort-push-creates-new-remote-branches">Mercurial merge branches? (abort: push creates new remote branches)</a></p>
  
  <p>Here I've inadvertently created a situation where Mercurial wants to create a new remote head.  What's the best way to undo this, and leave little or no trace of this mistake on the remote side?  </p>
  
  <pre><code>###&gt; hg push
  pushing to http://example.com
  searching for changes
  abort: push creates new remote heads on branch 'default'!
  (did you forget to merge? use push -f to force)
  
  ###&gt; hg revert --all -r tip
  
  ###&gt; hg update -C
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  
  ###&gt; hg incoming
  comparing with http://example.com
  searching for changes
  no changes found
  
  ###&gt; hg summary
  parent: 488:e3db024fe901 tip
   Misc.
  branch: default
  commit: (clean)
  update: 6 new changesets, 2 branch heads (merge)
  
  ###&gt; hg pull
  pulling from http://example.com
  searching for changes
  no changes found
  
  ###&gt; hg glog
  @  changeset:   488:e3db024fe901
  |  tag:         tip
  |  summary:     Misc.
  |
  o  changeset:   487:b207579b9d41
  |  parent:      480:ce775708800c
  |  summary:     Misc.
  |
  | o  changeset:   486:59a7a5b34c7f
  | |  user:        other
  | |  summary:     fixes
  | |
  | o  changeset:   485:b28264333e18
  | |  user:        other
  | |  summary:     binary
  </code></pre>
  
  <p>If I merge, it sort of seems OK:</p>
  
  <pre><code>hg merge
  abort: outstanding uncommitted merges
  </code></pre>
  
  <p>But <code>hg diff</code> shows all sorts of changes I did not make.  I'm willing to re-apply my changes... how can I bring this all back to a single tip, abandoning all local changes?</p>