I'm using MacHg 0.9.21 on OSX 10.6. My machine is freshly rebooted.
Forced merging has never ever worked for me. I use MacHg since a couple months. Steps to reproduce:
Have uncommitted changes in the repo
Open merge panel and select a revision/branch
Check "force merge" and merge
"What will happen" text to change from "The revision selected above will be merged into current revision" to something like "The revision selected above will be forced to be merged into current revision".
Merge the selected revision (even with outstanding uncommitted changes) as if `merge -f <revision/branch>` has been manually done.
"What will happen" text doesn't reflect the "force merge" checkbox value.
Mercurial errors with:
Mercurial reported error number 255:
abort: outstanding uncommitted changes (use 'hg status' to list changes)
Thank you, I hope this will be a more useful bug report.