Murky 0.8.2 (some merge fixes)

[Jens Alfke]

I’ve checked in fixes to some merge issues, and released a build of Murky 0.8.2:

http://bitbucket.org/snej/murky/downloads/Murky%200.8.2.zip

The fixes are:

• I had stupidly made Murky only recognize conflicts between two committed revisions (it thought there could only be a conflict if the tip revision had two parents.) I forgot that you can get conflicts if you have uncommitted changes and pull a revision that touches the same files. Murky now recognizes this state.

• The merge-related commands in the file tree’s contextual menu wouldn’t do the right thing if you right-clicked an unselected file while there was a selection (they’d operate on the selected files instead.)

This revision also includes a few earlier changes:

• Speculative fix for the “parent!=_parent2” assertion failure exception.

• When invoking the “hg” tool, set HGPLAIN environment var to disable any custom formatting like ANSI colors which might confuse Murky, and prepend the "-y" (aka --noninteractive) flag so hg knows it can't prompt for user input.

• Some improved status and toolbar icons from David Keegan.

—Jens