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

merge: simplify 'other deleted' case

merge: simplify backwards revert test, ready to combine with other cases

merge: allow merging going backwards New behavior is generally superior and more correct, except possibly with regards to missing files. hg up . is now effectively a no-op, which is probably the desired behavior for people expecting to move to tip, but may surprise people who were expecting deleted files to reappear. case 1: update to . a-w -> a-w classic: ancestor a missing recreated right? rmed recreated WRONG added forgotten WRONG changed preserved RIGHT conflicted can't happen backward merge: ancestor a (NO EFFECT) missing missing wrong? rm'ed rm'ed RIGHT added preserved RIGHT changed preserved RIGHT conflicted can't happen case 2: update to ancestor of . a-b-w -> b-w \ a classic: ancestor a missing recreated right? rmed recreated wrong? added forgotten wrong? changed preserved RIGHT conflicted preserved wrong? backwards merge: ancestor b missing missing or conflict right? rm'ed missing or conflict right? changed preserved RIGHT conflicted merge RIGHT added preserved right?

merge: reorder remote creation tests

merge: drop recreating case

merge: drop an overwrite test

merge: simplify a delete case

merge: reorder get cases for future simplification

merge: fix prompt keep

merge: remove a flags case

merge: pretend ancestor is local to simplify backwards and overwrite

merge: simplify flag merging code slightly

dirstate: eliminate reference cycle from normalize Bound methods hold a reference to self, so assigning a bound method to an instance unavoidably creates a cycle. Work around this by choosing a normalize method at walk time instead. Eliminate default arg while we're at it.

cleanup: removed unused imports

hgrc.5: wrap lines at 70 chars (whitespace cleanup)

hgignore.5: wrap lines at 70 chars (whitespace cleanup)

hg.1: wrap lines at 70 chars (whitespace cleanup)