Bryan O'Sullivan <bos@serpentine.com> [Wed, 19 Dec 2007 19:21:30 -0800] rev 5676
Merge with crew
Jesse Glick <jesse.glick@sun.com> [Wed, 19 Dec 2007 17:02:31 -0500] rev 5675
Issue 882: add standard hook to reject text files with CRLF.
While the win32text extension does LF <-> CRLF conversion, and will issue a
warning in case a file already in the repository uses CRLF, it provides no
mechanism for verifying that incoming changes use LF. In a large development
team with some Windows users, it is virtually guaranteed that someone will
forget to set up the encode filter correctly and accidentally check in a file
using CRLF, which can cause warnings for other Windows users when they next
fetch changes. Since this is a general problem it is desirable to have a
pre-commit (or -push) hook available to reject such accidents earlier rather
than trying to fix them up after the fact.
Christian Ebert <blacktrash@gmx.net> [Sun, 16 Dec 2007 22:55:23 +0100] rev 5674
patchbomb: make "hg email -b" w/o destination work as advertised
peter.arrenbrecht@gmail.com [Wed, 19 Dec 2007 22:36:18 +0100] rev 5673
mq: add --currentuser and --user options to qnew and qrefresh
These options make qnew and qrefresh add/update the "From:" header (or, if present,
the "# User" header). This allows proper attribution of patches in patch queues
with multiple contributors.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 27 Dec 2007 13:39:03 +0100] rev 5672
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 27 Dec 2007 10:32:33 +0100] rev 5671
Make ui.prompt repeat on "unrecognized response" again (issue897)
(this was accidentally changed in ca0d02222d6a)
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 26 Dec 2007 22:47:16 +0100] rev 5670
Fix misleading error and prompts during update/merge (issue556)
Patrick Mezard <pmezard@gmail.com> [Tue, 25 Dec 2007 22:21:51 +0100] rev 5669
patch: be more tolerant to diffstat failures (issue 865)
Sometimes, revisions cannot be represented by a regular diff, only a git diff
would capture binary files or permission changes. diffstat cannot handle git
patches and will output "0 files changed" when fed with an empty diff. We
cannot consider the latter to be an error, unless we rewrite diffstat to handle
these correctly.