Martin Geisler <mg@aragost.com> [Fri, 13 Jan 2012 11:38:49 +0100] rev 15853
commands: no need to rename merge and phases on import
Martin Geisler <mg@aragost.com> [Fri, 13 Jan 2012 11:34:09 +0100] rev 15852
phase: there is actually no -C option
Martin Geisler <mg@aragost.com> [Fri, 13 Jan 2012 11:29:47 +0100] rev 15851
phase: use standard syntax for command line flags
We don't mark them as literal text and we mention the short option the
first time we talk about a given flag.
Martin Geisler <mg@aragost.com> [Fri, 13 Jan 2012 11:26:24 +0100] rev 15850
phase: fix RST markup (use ``...`` for literal text)
Martin Geisler <mg@aragost.com> [Fri, 13 Jan 2012 11:23:45 +0100] rev 15849
phase: lowercase option help, rephrase slightly
Yuya Nishihara <yuya@tcha.org> [Thu, 12 Jan 2012 00:49:45 +0900] rev 15848
filectx: fix cmp() of file starting with '\1\n'
If file data starts with '\1\n', it will be escaped in the revlog to
create an empty metadata block, thus adding four bytes to the size in
the revlog size index. There's no way to detect that this has happened
in filelog.size() faster than decompressing each revision [1].
For filectx.cmp(), we have the size of the file in the working directory
available. If it differs by exactly four bytes, it may be this case, so
do a full comparison.
[1]: http://markmail.org/message/5akdbmmqx7vq2fsg
Matt Mackall <mpm@selenic.com> [Wed, 11 Jan 2012 09:27:53 -0600] rev 15847
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 11 Jan 2012 09:27:37 -0600] rev 15846
merge with i18n