Add --line-number option to hg annotate (issue506) Line numbers are separated from the last annotation element with a colon, like with many other commands, e.g. (hg) grep or compiler errors. Idea and tests by FUJIWARA Katsunori.

Allow filectx.annotate to return the line number of first appearance.

Check for conflict markers in hgmerge (issue471)

merge with crew-stable

Fixed double slash for doc install path introduced by using $DESTDIR (issue620) $MANDIR already is an absolute path so the extra / isn't needed.

hg log: Move filtering implicit parents to own method and use it in templater. Extended test repo in test-command-template to contain changeset to test this.

Strip whitespace from changeset description in changeset_templater. changeset_printer already does this, too.

Removed deprecated hg:// and old-http:// protocols (issue406)

hgwebdir: check for repo foo before browsing subdirectories of foo/

Merge with crew

hgweb: browse subdirectories before checking whether parent directory is also a repository

Use a prefix for debuginstall tempfiles. This way you know where the files came from if they don't get removed.

python 2.3 does not have sorted

Sort changelog extra dict to avoid possible nondeterminism

Last change broke new-style URLs

hgwebdir: do not walk up the given path looking for a repository. It is there or it isn't.

merge with crew-stable

merge with crew-stable

Add html docs and use for help shortcut

hgwebdir: show only trailing part of path when browsing subdirectories

gitweb: add notfound template

hgweb: let hgwebdir browse subdirectories

convert: svn code movement (no actual changes)

convert: svn: avoid parsing already-seen logentries due to branch following

Merge with main

Merge with stable

Merge with crew-stable

merge: fix adding untracked files on directory rename (issue612) Fix from Brendan Added test case

extensions: untangle some recursive dependencies

interhg extension allows you to change changelog text like InterWiki.

setup.py not executable: change instructions at beginning of file

Merge with stable

merge: make test for fast-forward merge stricter (issue619) don't allow merging with an ancestor fix != on contexts add a test

convert: svn: some improvements in memory usage

convert: svn: remove svn_paths wrappers

convert: svn: use revmap to parse only new revisions in incremental conversions

convert: export revmap to source. Sources may be able to use it to optimise their own log fetching

convert: svn: defer get_log parsing until after get_log completes. According to the documentation, it is not safe to perform any other operation on the ra object until get_log completes.

convert: move some code into common init function

Merge with crew

alias: remove dead code

convert: call superclass init from engine init functions

Merge with crew-stable

test-archive: stop checking md5 absolute values Different tar/zlib versions can generate different binaries.

Fix issue589 wording problem

Fix serve on Windows without win32* modules.

test-demandimport: match upper-case hexadecimal

Add alias extension