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)

bookmarks: touch changelog on write to force hgweb reload

mq: explicit exit code when patch is already on top

mq: fix qpush --move for selected guarded patches In the case of guarded patch, the patch could not be found because the full_series list contains also the guard value appended to each patch name. As we already checked that the patch is pushable above in the code, we just have to use the series list (which doesn't contains guard value) to get the patch index.

help: glossary.txt formatting fixes

help: fix glossary.txt named branches description

zeroconf: Use BadDomainName exception instead of string exceptions String exceptions no longer work in python 2.6. Use exception classes instead.

bookmarks: Use error message consistently The 'updating bookmark %s failed!' message is better than 'failed to update bookmark %s'. To have more consistent error messages we use just 'updating bookmarks %s failed'.

Merge with default, fix up stray topological head from i18n

i18n: disable check-code on polib.py

bookmarks: Add -B option to incoming/outgoing to compare bookmarks We add a -B/--bookmarks option to hg incmoing and hg outgoing. If the option is passed we compare bookmarks instead of changesets. This can be used to see which bookmarks do not exists on the remote site.

Merge with i18n

discovery: use stable sort order in --new-branch warning A Python set seems to do this already when you iterate over it, but this should be considered an implementation detail and not something we can rely on. This also gets rid of an unnecessary string conversion -- the set already contains strings.

Merge with i18n

Merge i18n default into stable

i18n-pt_BR: synchronized with b4467a7d5c75

Merge with mpm

i18n-da: copy msgids that does not need translating

acl: delete trailing whitespace in docstring