Question

I merged my repository, and I want to discard the merge. I've tried hg revert to the default branch (which works) but it still doesn't let me update to the default branch, because I get an abort: outstanding uncommitted merges error.

Answer 1

You can discard the current changes by passing the -C option to hg update, so hg update default -C will discard all uncommitted changes and update to the tip of the default branch.

Answer 2

Hi Chris! If you haven't committed the merge yet, you can clear out the pending merge with hg update -C . -- . is shorthand for "the current revision", i.e. the revision you were at before you merged. Your merge changes will be deleted and you'll be left with both heads in your repository.

UPDATE: added the -C flag, which I forgot.