merge: delay writing the mergestate during until commit is called
This speeds up merges of lots of files considerably.
tests: compatibility fix.
'touch -d *' doesn't work on Mac OS X. In order to prevent this from
occuring again, a check for the case is added to 'check-code.py'.
context: fix filectx.undelete() (
issue2388)
Restore lexists() changes lost in
e0ee3e822a9a merge
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.
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.
transplant: fix var name conflict introduced by
2912881c2a98