Cédric Duval <cedricduval@free.fr> [Mon, 10 May 2010 22:06:28 +0200] rev 11150
patchbomb: Reply-To support
From RFC 5322:
an optional reply-to field MAY also be included, which contains the field
name "Reply-To" and a comma-separated list of one or more addresses.
[...]
When the "Reply-To:" field is present, it indicates the address(es) to which
the author of the message suggests that replies be sent. In the absence of
the "Reply-To:" field, replies SHOULD by default be sent to the mailbox(es)
specified in the "From:" field unless otherwise specified by the person
composing the reply.
Reply-To addresses may be specified either via command line with --reply-to
or via the 'email' or 'patchbomb' sections of the config file.
David Champion <dgc@uchicago.edu> [Mon, 10 May 2010 11:04:56 -0500] rev 11149
merge: tool.check = prompt will force an interactive merge check
tool.check = prompt can be used when the exit status of a merge
tool is unreliable but an explicit user signoff on the merge result is
acceptable.
David Champion <dgc@uchicago.edu> [Mon, 10 May 2010 11:04:56 -0500] rev 11148
merge: introduce tool.check parameter
tool.check is a list of check options, and can be used in place of
tool.checkchanged and tool.checkconflicts:
Equivalences:
tool.checkchanged = yes
tool.checkconflicts = no
tool.check = changed
tool.checkchanged = no
tool.checkconflicts = yes
tool.check = conflicts
tool.checkchanged = yes
tool.checkconflicts = yes
tool.check = changed, conflicts
Add _toollist() wrapper for ui.configlist() to implement this consistently.
checkchanged and checkconflicts are still supported, but check is
preferred for implementing new check options.
David Champion <dgc@uchicago.edu> [Wed, 21 Apr 2010 12:02:51 -0500] rev 11147
give worst-case 'merge' merge-tool lowest priority
Another tool had -10 already. Since 'merge' is clearly a worst-case
tool (internal), lowering to -100 ensures there's plenty of room for
slightly better cases.
David Champion <dgc@uchicago.edu> [Wed, 21 Apr 2010 11:57:45 -0500] rev 11146
merge: tool.premerge=keep will leave premerge markers in $local
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 11 May 2010 20:22:37 +0200] rev 11145
merge with mpm