How to "push" manually?

[skip at pobox.com]

    >> I want the changeset from Ben Finney in my local repository, but not
    >> on my web server.  Going back to my original attempt to push, should
    >> I have explicitly just pushed rev/changeset 82:20939e395812?

    >> Yes. You would have typed $,1r|(Bhg push -r82$,1r}(B.

    >> ($,1r|(B82:20939e395812$,1r}(B is two revision identifiers, not one. One is the  
    >> commit's repository-local serial number, which is the decimal number  

I tried "hg push -r82" just now but nothing updated.  Crap.  Now I have this
revision (20939e395812) on my webserver, but not the entire history of that
head.  How do I revert the first push?  (Never mind.  After a false start I
started from scratch on my web server.  I think I have it corrected now.)

    >> At this point we've established that I somehow messed up my repo (at  
    >> least w.r.t. the repo on my web server).

    >> No, you haven't. You haven't done anything wrong that I can see; you  
    >> just haven't merged yet.

I beg to differ.  By incorporating Ben's changes into my repo (not realizing
what I was doing) I incorporated code I hadn't seen.  I wanted to "import"
it simply so I could work with it.  I didn't expect to use his code as he
wrote it, but this .hg file was an opaque thing I couldn't deal with
directly.  I believe now that I should have probably imported his .hg file
into an entirely new repository.

-- 
Skip Montanaro - skip at pobox.com - http://www.smontanaro.net/
        "XML sucks, dictionaries rock" - Dave Beazley