remove pointless os.path.join calls when opening files in .hg/cache Windows deals just fine with '/' in paths and Mercurial on Windows already does file accesses elsewhere with mixed \ and / in file paths anyway. This patch also makes the static-http repo case use proper URLs of the form http://example.com/repo/.hg/cache/branchheads http://example.com/repo/.hg/cache/tags instead of the entirely pointless http://example.com/repo/.hg/cache%5Cbranchheads http://example.com/repo/.hg/cache%5tags (as introduced by 5ccdca7df211)

backout: make help more explicit about what backout does The help for backout explains: The backout command merges the reverse effect of the reverted changeset into the working directory. Unfortunately, that does not make it obvious to a newcomer what the backout command does. Since it performs a 3-way merge, what is the common ancestor? Will the result be automatically committed? What is this reverted changeset --- is it the rev passed with -r on the command line or its inverse? So try to clarify the description, avoiding jargon and being explicit about what happens from the user's perspective. Thanks to Gilles Moris, Steve Borho, Kevin Bullock, and timeless for help.