Martin Geisler <mg@lazybytes.net> [Sat, 12 Dec 2009 23:03:05 +0100] rev 10049
Merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 11 Dec 2009 15:09:52 +0900] rev 10048
mq: qpop: remove added files before re-adding removed files
We need to do this to avoid file/directories conflicts.
This causes patches removing a committed file and replacing it
with a directory to be "unpoppable".
Greg Ward <greg-hg@gerg.ca> [Thu, 10 Dec 2009 09:35:43 -0500] rev 10047
revlog: rewrite several method docstrings
- methods: findmissing(), nodesbetween(), descendants(), ancestors()
- the goal is precise, concise, accurate, grammatical, understandable,
consistently formatted docstrings
David Soria Parra <dsp@php.net> [Fri, 11 Dec 2009 11:04:31 +0100] rev 10046
color: Add support for bookmarks
David Soria Parra <dsp@php.net> [Fri, 11 Dec 2009 11:04:31 +0100] rev 10045
color: Do not pass --color, --no-color parameters to wrapped function
Passing the --color and --no-color parameter to the wrapped function
can cause a invalid argument exception if the wrapped function doesn't
accepts a **opts dict.
Martin Geisler <mg@lazybytes.net> [Sat, 12 Dec 2009 16:54:33 +0100] rev 10044
Merge with stable