how to fix the problem "abort: push creates new remote heads on branch 'default'!" when pushing

[higery]

Hi,

I have pulled all the updates from the remote repo and merge my developing
branch
with the default branch, but when pushing, an error occured:

*$ hg push
pushing to http://bitbucket.org/higery/cpython
real URL is https://bitbucket.org/higery/cpython
searching for changes
abort: push creates new remote heads on branch 'default'!
(did you forget to merge? use push -f to force)*

When I use 'hg heads default' to see all heads of the default branch, it
showes that there are two,

*$ hg heads default
changeset:   71798:7d390c3a83c6
parent:      71795:b09d07d1f696
parent:      71797:867ce75b885c
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Aug 20 14:18:25 2011 +0200
summary:     Issue #12791: Break reference cycles early when a generator
exits w
ith an exception.

changeset:   70851:a06c1590995e
user:        higery
date:        Tue Jul 12 15:50:27 2011 +0800
summary:     Replace a tab with 4-spaces to indent.*


Then, how to fix this problem?


Best regards,
higery
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20110820/2c301df2/attachment.html>