So I keep making a silly mistake in Mercurial. Often times, I'll start work without doing an "hg pull" and an "hg update." When I try to push my changes, I get an error.

Is there any way to delete my *local commits* so I can avoid creating multiple heads, branches, etc? I just want to delete my local commits, merge my changes with the tip, and then re-commit. Sounds simple, right? I can't seem to find any way to easily delete *local commits* so I can cleanly merge with the tip.

Again, I'm only trying to delete local commits made with "hg ci". I don't want to modify files, revert, etc.