Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)

Make ui.prompt repeat on "unrecognized response" again (issue897) (this was accidentally changed in ca0d02222d6a)

Fix misleading error and prompts during update/merge (issue556)

patch: be more tolerant to diffstat failures (issue 865) Sometimes, revisions cannot be represented by a regular diff, only a git diff would capture binary files or permission changes. diffstat cannot handle git patches and will output "0 files changed" when fed with an empty diff. We cannot consider the latter to be an error, unless we rewrite diffstat to handle these correctly.

Fix chmod of writable but unowned files (issue530) This could happen e.g. in group writable local repositories where a file should become executable on update. (Patch by Benoit Boissinot attached to issue530)

Fix test-convert-darcs output on Debian etch (issue779) The CR characters of darcs get confused the output. Additionally this darcs version printed: darcs: <stdin>: hGetLine: end of file

fix spelling error

Merge with stable

Fix income/pull with bundle and -R (issue 820). Uses ui.setconfig() to tell bundlerepo where the main repo is. This is needed for when the --repository option is used. Adds tests to test-bundle and a new test script test-mq-pull-from-bundle, which plays out the situation that initially made me detect this bug (hg -R .hg/patches pull ../bundle.hg).

Add output markers to test-bundle so it's easier to spot the source of output diffs.

hgk: add black and blue as preferred colors

Remove spurious escape attempt in hg.1.txt

Use VISUAL in addition to EDITOR when choosing the editor to use.

util: get rid of is_win_9x wart

Add --verbose support to tags command.

Properly check tag's existence as a local/global tag when removing it.

[RFC] convert: fix --datesort The problem is that previously commit.date was used for sorting, but it's a string like "1 Jan xxx 2007", so it it wrong to use it for sorting. Another problem is that why we are using depth for sorting -- I have no clear answer -- it seems to be plain wrong. This patch is just an RFC.

highlight: pass encoding to lexers and formatter Try to avoid UnicodeDecodeError by: - encoding to local - passing util._encoding as lexer input encoding - passing hgweb.encoding as formatter output encoding

highlight: mandatory arguments where possible

patch: simplify directory creation

patch: write rej files for missing targets (issue 853)

patch: avoid file existence tests when possible in selectfile()

patch: move diff parsing in iterhunks generator

patch: move NoHunk detection up with parsing code