keyword: add verify to nokwcommands after refactor in e79a8f36c2a5 Add test as well. Thanks to Guy Brand for spotting this.

merge with crew-stable

Let the notify extension use [diff] options too.

coal/paper: fixed box via an expression for IE < 7

Fix intermittent broken pipe in test-highlight

ui: add an option to prompt for the username when it isn't provided When ui.askusername is set and not username are specified on the command line, in hgrc or in the variables $HGUSER or $EMAIL, then hg will prompt for the username. Feature requested, and documentation provided by Mark Edgington.

Merge with crew-stable

add additional bisect tests

add additional complex bisect tests (with non-linear history)

Add support for multiple possible bisect results (issue1228, issue1182) The real reason for both issue is that bisect can not handle cases where there are multiple possibilities for the result. Example (from issue1228): rev 0 -> good rev 1 -> skipped rev 2 -> skipped rev 3 -> skipped rev 4 -> bad Note that this patch does not only fix the reported Assertion Error but also the problem of a non converging bisect: hg init for i in `seq 3`; do echo $i > $i; hg add $i; hg ci -m$i; done hg bisect -b 2 hg bisect -g 0 hg bisect -s From this state on, you can: a) mark as bad forever (non converging!) b) mark as good to get an inconsistent state c) skip for the Assertion Error Minor description and code edits by pmezard.