hg.1: simplify synopsis Now that arguments can be mixed with options we can simplify the synopsis considerably. Also, highlighting the command name in bold (instead of italics) seem to be the standard convention.

hgrc.5: spell check

man pages: add meta data This removes the fixme's that were otherwise inserted.

man pages: updated copyright years

hgrc.5: use NOTE admonition paragraph

hgrc.5: reformatted to avoid big chunks of monospaced text The man page used to have lines longer than 80 characters, even though all lines in the hgrc.5.txt file were wrapped nicely. The problem turned out to be that the indented paragraphs started literal blocks instead of normal paragraphs. The literal blocks were of course not wrapped when displayed by man. In short, the asciidoc rules require lists to be formatted like this: foo:: Some description of foo. + Another paragraph in the description of foo. It *must* start flush left and the plus is necessary to indicate that this is a list item continuation. Lists with nested lists can be formatted correctly using something called "open blocks". These blocks are used to group the list items and are marked by a line above and below with two dashes. See the asciidoc user guide for the gory details...

hgrc.5: mark filename patterns as monospaced text

hgrc.5: single quotes means italic in asciidoc Use double quotes instead and mark the * as monospaced text.

man pages: mark filenames and env vars as fixed text

test-convert-svn-*: no longer need the url building code

convert: default to file protocol when no :// found for svn repo url Edited by pmezard: add path separator normalization

keyword: improve English

bookmarks: improve English

Generally replace "file name" with "filename" in help and comments.

Spell Mercurial as a proper noun

win32text: drop disabling portion of test disabling extension leaves dirstate confused about whether affected files are clean or not, not much point testing it.

i18n-de: Synchronised with hg.pot translated by Fabian Kreutz <fabian.kreutz@qvantel.com> Tobias Bell <tobias.bell@gmail.com>

i18n-pt_BR: synchronized and updated - synchronized with hg 6019e6517f95 - translated remaining messages - many spelling and formatting fixes

convert: better support for CVS branchpoints (issue1447) This records the branches starting at individual CVS file revisions, using the symbolic names map rather than just the branches information. This information is used to generate Mercurial changesets. Despite the changes, the CVS conversion still suffers heavily from cvsps' deficiencies in generating a correct representation of the CVS repository history.

Merge with stable

Merge with crew

merge: refactor manifestmerge init to better report effective ancestor

merge: simplify file revision comparison logic

merge: make locally-added file test more correct

merge: drop unused diverge initialization

merge: refactor some initialization, drop backwards var

merge: combine a copy and move case

merge: drop a flag update case

merge: combine three identical 'remote is newer' cases

merge: drop 'remote deleted' case