[PATCH 0 of 2 stable] keyword: fix monkeypatch logic for diff
Christian Ebert
blacktrash at gmx.net
Tue Dec 22 17:18:53 CST 2009
* Christian Ebert on Tuesday, December 22, 2009 at 22:55:31 +0000
> These 2 patches fix a flaw in the monkeypatch logic of diff that
> became apparent when hg transplant --branch. Commands that work
> with diff and patch should never expand keywords when reading
> from filelog. However this happened unintentionally when
> comparing 2 explicitly given revisions.
>
> The solution: simply do not monkeypatch diff when in restricted
> mode.
>
> Finally, add transplant to the commands that trigger restricted
> mode.
Sorry, I flagged this for stable but the patches are against
crew. I shall resubmit when I have an answer to
> Should I provide a test?
Which will be positive, I fear ;-)
c
--
Wer auf sein Elend tritt, steht höher.
_HÖLDERLIN: H Y P E R I O N_ --->> http://www.blacktrash.org/hyperion/
More information about the Mercurial-devel
mailing list