merge with stable

This commit is contained in:
Matt Mackall 2011-08-18 17:24:04 -05:00
commit c3e3cbc373
2 changed files with 4 additions and 2 deletions

View File

@ -2523,7 +2523,9 @@ def heads(ui, repo, *branchrevs, **opts):
no child changeset on the same branch.
If one or more REVs are given, only branch heads on the branches
associated with the specified changesets are shown.
associated with the specified changesets are shown. This means
that you can use :hg:`heads foo` to see the heads on a branch
named ``foo``.
If -c/--closed is specified, also show branch heads marked closed
(see :hg:`commit --close-branch`).

View File

@ -1166,7 +1166,7 @@ The full set of options is:
extension. This will serve HTML files as ``text/html`` and might
allow cross-site scripting attacks when serving untrusted
repositories. Default is False.
``allow_read``
If the user has not already been denied repository access due to
the contents of deny_read, this list determines whether to grant