eol: be explicit about how to enable hook (
issue2661)
eol: stop after first matched rule in hook (
issue2660)
When matching a file against the rules in .hgeol, the eol extension's
hook should stop after the first matching rule is encountered.
Otherwise, if this rule is contradicted by other more general rule
(for example a catch-all at the end of .hgeol), some files are simply
impossible to push. Trivial example:
**.bat = CRLF
** = LF
If all matching rules were applied, a .bat file would be rejected
either because it has LFs (first rule) or because it has CRLFs (second
rule).
i18n-pt_BR: synchronized with
3178aca36b0f
help: document branch template keyword
The branch keyword was added in
d79fdff55627
i18n-sv: synchronized with
95b0d4c1c9e1
convert.svn: branch name which equals trunk means `default' branch (
issue2653)
Converting from subversion specifying config.svn.trunk results
in storing trunk under branch named as config.svn.trunk, where `default'
brunch is expected. Submission contains patch and test.
ui: always report untrusted hgrc files when debug enabled
It was suggested in IRC that people disabling the reporting of unstructed hgrc
files can masquerade as problems. This makes sure untrusted hgrc files are
always reported if --debug is used.
tests: test renaming a file added on two branches (
issue2089)
The issue was fixed by
d100702326d5 .