Mercurial > hg
view mercurial/templates/paper/branches.tmpl @ 19987:ba6486076429 stable
merge: move forgets to the beginning of the action list
Forgets need to be in the beginning of the action list, same as removes. This
lets us avoid clashes in the dirstate where a directory is forgotten and a
file with the same name is added, or vice versa.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 06 Nov 2013 10:20:18 -0800 |
parents | ac08ff370977 |
children | 70cfa7e1611b |
line wrap: on
line source
{header} <title>{repo|escape}: branches</title> <link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-branches" title="Atom feed for {repo|escape}: branches" /> <link rel="alternate" type="application/rss+xml" href="{url|urlescape}rss-branches" title="RSS feed for {repo|escape}: branches" /> </head> <body> <div class="container"> <div class="menu"> <div class="logo"> <a href="{logourl}"> <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a> </div> <ul> <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">log</a></li> <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li> <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li> <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> <li class="active">branches</li> </ul> <ul> <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> </ul> <p> <div class="atom-logo"> <a href="{url|urlescape}atom-branches" title="subscribe to atom feed"> <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed"> </a> </div> </div> <div class="main"> <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2> <h3>branches</h3> <form class="search" action="{url|urlescape}log"> {sessionvars%hiddenformentry} <p><input name="rev" id="search1" type="text" size="30" /></p> <div id="hint">{searchhint}</div> </form> <table class="bigtable"> <tr> <th>branch</th> <th>node</th> </tr> <tbody class="stripes2"> {entries % branchentry} </tbody> </table> </div> </div> {footer}