abort: push creates new remote heads!

[Joseph Turian]

> Apparently you had uncommited changes (check with *hg st -m*) and so the
> merge aborts (it could come out with conflicts on files that have to be
> merged and have uncommitted changes).


I don't think this was the case, because I actually checked and everything
was committed.
I omitted this from the log, my mistake.

I fixed the problem (don't ask... it was annoying) because I needed to make
progress on my work.
Next time this problem occurs, can I 'cp' the directory so I can keep the
broken version for debugging and understanding the correct hg solution, and
still have a working copy that I've fixed and make progress on?

Thanks,
  Joseph

-- 
Academic: http://www-etud.iro.umontreal.ca/~turian/
Business: http://www.metaoptimize.com/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20080417/6760c20b/attachment.htm