| Submitter | Mike Williams |
|---|---|
| Date | May 15, 2013, 10 p.m. |
| Message ID | <7b012e75db5cfb265042.1368655219@localhost.home.nodnol.plus.com> |
| Download | mbox | patch |
| Permalink | /patch/1655/ |
| State | Accepted |
| Commit | 01d68fb07915fba6f83dfd2dce004e024d8803b5 |
| Headers | show |
Comments
On Wed, 2013-05-15 at 23:00 +0100, Mike Williams wrote: > # HG changeset patch > # User Mike Williams <mrw@eandem.co.uk> > # Date 1368652752 -3600 > # Wed May 15 22:19:12 2013 +0100 > # Branch stable > # Node ID 7b012e75db5cfb265042c0c1457a9a280934e135 > # Parent 278057693a1ddb93f95fa641e30e7a966ac98434 > 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. Queued for stable, thanks.
Patch
diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -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 .`. diff --git a/mercurial/help/urls.txt b/mercurial/help/urls.txt --- a/mercurial/help/urls.txt +++ b/mercurial/help/urls.txt @@ -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