diff --git a/mercurial/templates/paper/filelogentry.tmpl b/mercurial/templates/paper/filelogentry.tmpl --- a/mercurial/templates/paper/filelogentry.tmpl +++ b/mercurial/templates/paper/filelogentry.tmpl @@ -3,6 +3,6 @@ {author|person} {desc|strip|firstline|escape|nonempty} - {inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{rename%filelogrename} + {inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{bookmarks%changelogtag}{rename%filelogrename} diff --git a/tests/test-hgweb-filelog.t b/tests/test-hgweb-filelog.t --- a/tests/test-hgweb-filelog.t +++ b/tests/test-hgweb-filelog.t @@ -223,7 +223,7 @@ tip - two revisions test first a - a-tag + a-tag a-bookmark @@ -340,7 +340,7 @@ second version - two revisions test first a - a-tag + a-tag a-bookmark @@ -449,7 +449,7 @@ first deleted - one revision test first a - a-tag + a-tag a-bookmark @@ -558,7 +558,7 @@ first version - one revision test first a - a-tag + a-tag a-bookmark