Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: stop documentation markup appearing in generated help stable
authorMike Williams <mrw@eandem.co.uk>
Wed, 15 May 2013 22:19:12 +0100
branchstable
changeset 19197 01d68fb07915
parent 19193 278057693a1d
child 19198 15aef461facd
help: stop documentation markup appearing in generated help Markup for links to mercurial commands is appearing in the help documentation. This patch fixes the markup so mercurial command reference links are correctly generated in the help documentation.
mercurial/commands.py file | annotate | diff | comparison | revisions
mercurial/help/urls.txt file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Tue May 14 18:43:53 2013 -0500
+++ b/mercurial/commands.py	Wed May 15 22:19:12 2013 +0100
@@ -4917,7 +4917,6 @@
     """restore files to their checkout state
 
     .. note::
-
        To check out earlier revisions, you should use :hg:`update REV`.
        To cancel an uncommitted merge (and lose your changes), use
        :hg:`update --clean .`.
--- a/mercurial/help/urls.txt	Tue May 14 18:43:53 2013 -0500
+++ b/mercurial/help/urls.txt	Wed May 15 22:19:12 2013 +0100
@@ -7,8 +7,8 @@
   ssh://[user@]host[:port]/[path][#revision]
 
 Paths in the local filesystem can either point to Mercurial
-repositories or to bundle files (as created by :hg:`bundle` or :hg:`
-incoming --bundle`). See also :hg:`help paths`.
+repositories or to bundle files (as created by :hg:`bundle` or
+:hg:`incoming --bundle`). See also :hg:`help paths`.
 
 An optional identifier after # indicates a particular branch, tag, or
 changeset to use from the remote repository. See also :hg:`help
mercurial