From efdbb8077da928c03ddad54b65bce8c2183286e4 Mon Sep 17 00:00:00 2001 From: Martin Geisler Date: Thu, 18 Aug 2011 13:56:58 +0200 Subject: [PATCH 1/2] commands: clarify that 'hg heads foo' shows heads on branch foo This is a FAQ: people try 'hg heads -r foo' and only see the tip-most branch heads on foo. --- mercurial/commands.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mercurial/commands.py b/mercurial/commands.py index 419fcb342c..a5cf379987 100644 --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2518,7 +2518,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`). From 6790ac4b35f5aef97283066a5a3fdd4eacb13fb3 Mon Sep 17 00:00:00 2001 From: Wagner Bruna Date: Thu, 18 Aug 2011 10:15:14 -0300 Subject: [PATCH 2/2] help/config: strip trailing whitespace This disabled paragraph splitting for translations. --- mercurial/help/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt index f87f51020a..52c2fee226 100644 --- a/mercurial/help/config.txt +++ b/mercurial/help/config.txt @@ -1162,7 +1162,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