Wed, 23 Dec 2009 12:04:04 +0000 keyword: do not monkeypatch diff when in restricted mode stable
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.
Wed, 23 Dec 2009 13:12:36 +0100 merge with default
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 23 Dec 2009 13:12:36 +0100] rev 10115
merge with default
Wed, 23 Dec 2009 13:09:11 +0100 mq: qnew -f should reject merge working directories stable
timeless <timeless@mozdev.org> [Wed, 23 Dec 2009 13:09:11 +0100] rev 10114
mq: qnew -f should reject merge working directories
Tue, 22 Dec 2009 00:50:15 +0100 Merge with stable
Martin Geisler <mg@lazybytes.net> [Tue, 22 Dec 2009 00:50:15 +0100] rev 10113
Merge with stable
(0) -10000 -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip