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.
merge with crew stable
authorMatt Mackall <mpm@selenic.com>
Fri, 01 Feb 2013 15:14:05 -0600
branchstable
changeset 18525 462579cbad45
parent 18522 36549fa712da (current diff)
parent 18524 66ae2ded0968 (diff)
child 18526 9409aeaafdc1
merge with crew
--- a/mercurial/hgweb/webcommands.py	Thu Jan 31 19:56:55 2013 +0100
+++ b/mercurial/hgweb/webcommands.py	Fri Feb 01 15:14:05 2013 -0600
@@ -293,7 +293,7 @@
                 node=ctx.hex(),
                 parent=webutil.parents(ctx),
                 child=webutil.children(ctx),
-                currentbaseline=basectx.hex(),
+                basenode=basectx.hex(),
                 changesettag=showtags,
                 changesetbookmark=showbookmarks,
                 changesetbranch=showbranch,
--- a/mercurial/templates/paper/map	Thu Jan 31 19:56:55 2013 +0100
+++ b/mercurial/templates/paper/map	Fri Feb 01 15:14:05 2013 -0600
@@ -101,7 +101,7 @@
 
 changesetparent = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> '
 
-changesetbaseline = '<a href="{url}rev/{node|short}:{originalnode|short}{sessionvars%urlparameter}">{node|short}</a> '
+difffrom = '<a href="{url}rev/{node|short}:{originalnode|short}{sessionvars%urlparameter}">{node|short}</a> '
 
 filerevparent = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a> '
 filerevchild = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a> '
mercurial