Merge with crew-stable

convert/mtn: handle new files in moved directories (issue1619) Reported and investigated by Paul Aurich <paul@darkrain42.org>

keyword: set overwrite message only once, not for each file

run-tests: removed some underscores (coding style)

run-tests: upper-case global PYTHON variable

run-tests: reduce global variables set by parse_args().

run-tests: factor out main(); reduce use of globals a bit.

run-tests: move bits of main program so it's all at the bottom.

run-tests: move _hgpath() up so it's not in the middle of the main program.

run-tests: factor out parse_args(). Clarify use of globals a bit.

patch, i18n: avoid parameterized plural

keyword, i18n: avoid untranslated strings as message parameters

commands, i18n: avoid untranslated strings as message parameters

bookmarks: fix typo

convert: fix typo

i18n: the message should not contain '\r' reported by bardy <bardiku@gmail.com>

Add comment about this test failing under bzr 1.13 due to a bug in bzr.

test-highlight: adapt output to latest pygments keeping backwards compatibility

merge with stable

issue1577: fix broken test by assuming less about CVS output. Specifically, output of "cvs ci" varies unpredictably across CVS versions, so any test that includes the output of "cvs ci" is doomed to fail some of the time. This fixes that by discarding the output of "cvs ci".

cvsps: make debugging easier by adding __repr__() methods.

cvsps: update docstring for changeset class.

merge with crew

manifest: improve error message about newlines in filenames Include the offending filenames in the error message. Now this error message is consistent with the same error issued by dirstate.py (although there is still duplicate code).