Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 12:04:17 +0000] rev 10117
keyword: go into restricted mode when transplanting
Expanded keyword is read into diff with transplant -b otherwise.
Test this scenario.
Thanks to Adam Berkes for providing an example case.
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 12:04:04 +0000] rev 10116
keyword: do not monkeypatch diff when in restricted mode
kw_diff actually disabled restricted mode when 2 revisions were given,
because it effectively disables the extension in this case.
But the commands working with diff and patch need restricted mode
always enabled, i.e. expansion enabled when writing to the
working directory and - crucial for these commands - no expansion
when reading the filelog.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 23 Dec 2009 13:12:36 +0100] rev 10115
merge with default
timeless <timeless@mozdev.org> [Wed, 23 Dec 2009 13:09:11 +0100] rev 10114
mq: qnew -f should reject merge working directories
Martin Geisler <mg@lazybytes.net> [Tue, 22 Dec 2009 00:50:15 +0100] rev 10113
Merge with stable
Martin Geisler <mg@lazybytes.net> [Tue, 22 Dec 2009 00:50:03 +0100] rev 10112
hgext: enable extensions without "hgext." prefix in help texts