Question

I did what you're not supposed to do and used hg push -f to push my copy of a repo to Kiln. I did "a git" and after editing some commits (using mq) attempted to discard the old version of history by pushing a new head like that... so I don't want to merge the old head back in, just get rid of it. Is there an alternative to flushing and replacing the repository?

This is a follow-up to this question.

Answer 1

I believe this is what you want:

http://mercurial.selenic.com/wiki/PruningDeadBranches

Answer 2

You can merge but throw away all the changed from one of the heads. There is a check box option when you merge using TortoiseHG which gives you this option. I think of it a similar to SVN's "record the merge but don't do the merge" option.

Answer 3

If you find yourself with 2 heads with one corrupted

You can show your heads by: hg heads . Note the “.” at the end of the command

You cannot merge as this will bring in bad code. This procedure may help. The idea is :-

1. hg update –rev [good-rev]
   
2. hg merge –rev [bad-rev]
   
3. hg revert –rev [good-rev]
   
4. hg commit -m “supersede bad rev” -m scottp
   

This effectively undoes the bad-rev by reverting the bad-rev back to good-rev.