subrepo: correctly handle update -C with modified subrepos (issue2022) (based on a patch by Saint Germain)

http: deliver hook output to client

setup: ignore failures to build optional inotify extension

revset: make negate work for sort specs

update: synchronize permissions in the dirstate (issue1473) fix by Benoit, updated by mpm to not affect all clean files

heads: fix templating of headers again (issue2130) (tweaks and test by mpm)

minirst: use unicode string as intermediate form for replacement Some character encodings use ASCII characters other than control/alphabet/digit as a part of multi-bytes characters, so direct replacing with such characters on strings in local encoding causes invalid byte sequences.

subrepo: fix recording of + in .hgsubstate (issue2217)

mq: qimport cleanup on fail (issue2214) save state of successfully added patches and ensure cleanup on the way out.

test-acl: don't use $PWD solaris ....

test-alias: don't use the environment variable PWD solaris ...

revert: Make it clearer when not to use revert

progress: check stderr.isatty() before each print This prevents writing progress information to a non-tty stderr if one is swapped in after startup, which happens in `hg serve`.

http digest auth: reset redirect counter on new requests (issue2255) This fixes a regression introduced in a1e575b48563 when Mercurial reuses the auth handler for several requests and the redirect counter never is reset.

revset: deal with empty sets in range endpoints (spotted by Julian Cowley <julian@lava.net>)

subrepo: fix silent push failure for SVN (issue2241)

merge: pass constant cset ancestor to fctx.ancestor

context: allow passing the common cset ancestor to fctx.ancestor This is used by the next patch to speed up merge.applyupdates.

merge: document how to 'undo' a merge

resolve: do not crash on empty mergestate I managed to get an empty .hg/merge/state file by interrupting a merge by pressing Control-C. This lead to this error: TypeError: a2b_hex() argument 1 must be string or read-only buffer, not None since localnode is assigned None before the iteration over lines in the mergestate begins.

revset: fix spelling typo

parser: fix URL to effbot

glog: fix crash on empty revision range

mercurial.spec: don't include convert-repo - use "hg convert" instead

revset: remove debugging leftover

contrib: update tcsh_completion with commands for 1.6 Added the following commands: debugbuilddag debugdag debugpushkey debugrevspec.

bookmarks: fix in/out return values

bookmarks: fix bogus cut and paste for outgoing

addchangegroup: pass in lock to release it before changegroup hook is called Currently, callers of addchangegroup first acquire the repository lock, usually to check that an unbundle request isn't racing. This means that changegroup hook actions that might write to a repo get stuck waiting for a lock. Here, we add a new optional lock parameter and update all the callers. Post-1.6 we may make it non-optional.

cmdutil: only output style header once in non-buffered mode (issue2130)