Patrick Mezard <pmezard@gmail.com> [Tue, 21 Sep 2010 23:37:47 +0200] rev 12361
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Tue, 21 Sep 2010 23:14:58 +0200] rev 12360
context: fix filectx.undelete() (issue2388)
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 17:01:12 -0500] rev 12359
tests: fix hgweb template change
Patrick Mezard <pmezard@gmail.com> [Mon, 20 Sep 2010 23:42:23 +0200] rev 12358
Merge with crew
Patrick Mezard <pmezard@gmail.com> [Mon, 20 Sep 2010 22:41:10 +0200] rev 12357
Restore lexists() changes lost in e0ee3e822a9a merge
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 17:01:12 -0500] rev 12356
tests: fix hgweb template change
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 16:56:57 -0500] rev 12355
merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 16:56:44 -0500] rev 12354
merge with crew
Ryan Phillips <ryan@trolocsis.com> [Sun, 19 Sep 2010 21:20:38 -0500] rev 12353
hgweb: be consistent with the background highlighting on closed branches (Issue2386)
The coal and paper web themes will highlight closed branches as a visual cue to
the user. This patch makes the other two themes constistent.
For users with difficulty differentiating colors, it would be better to split
out closed branches to a new table or optionally hide them.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Mon, 20 Sep 2010 13:31:02 +0200] rev 12352
mq: fix the deprecation comment for qsave & qrestore.
Changeset bcf90e712dc3 deprecated qsave and qrestore. In the
deprecating comment, users were referred to 'rebase --mq' which -- at
the time the message was written -- didn't exist. Currently, on the
default branch, rebase *does* take a '--mq' option, but it probably
doesn't do what Dirkjan expected it to do when he wrote the message.
In the original, deprecating commit, little context was provided as to
why this change was made. Based on my recollection, concensus at the
Paris Sprint in February 2010 was that one of the problems with MQ was
that it exposed far too many commands. Notable among these were qsave
& qrestore: very few core developers understood what they did and even
fewer (none, IIRC) actually used them. However, they couldn't be
removed; not only do the usual backwards compatibility reasons apply,
but the hg book refers to them.