##// END OF EJS Templates
merge: make internal merge fail cleanly on symlinks...
merge: make internal merge fail cleanly on symlinks Simplemerge is not symlink aware and will never do the the right thing on symlinks. It would read the symlink as a file and abort with 'No such file or directory' on dangling symlinks. Instead, internal:merge now simply fails to merge symlinks.

File last commit:

r18200:b3126667 default
r18256:d084df89 default
Show More
branches.tmpl
66 lines | 1.7 KiB | application/x-cheetah | CheetahLexer
{header}
<title>{repo|escape}: branches</title>
<link rel="alternate" type="application/atom+xml"
href="{url}atom-branches" title="Atom feed for {repo|escape}: branches" />
<link rel="alternate" type="application/rss+xml"
href="{url}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}{logoimg}" alt="mercurial" /></a>
</div>
<ul>
<li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li>
<li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li>
<li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
<li class="active">branches</li>
</ul>
<ul>
<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
</ul>
<p>
<div class="atom-logo">
<a href="{url}atom-branches" title="subscribe to atom feed">
<img class="atom-logo" src="{staticurl}feed-icon-14x14.png" alt="atom feed">
</a>
</div>
</div>
<div class="main">
<h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2>
<h3>branches</h3>
<form class="search" action="{url}log">
{sessionvars%hiddenformentry}
<p><input name="rev" id="search1" type="text" size="30" /></p>
<div id="hint">find changesets by author, revision,
files, or words in the commit message</div>
</form>
<table class="bigtable">
<tr>
<th>branch</th>
<th>node</th>
</tr>
{entries %
' <tr class="tagEntry parity{parity}">
<td>
<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}" class="{status}">
{branch|escape}
</a>
</td>
<td class="node">
{node|short}
</td>
</tr>'
}
</table>
</div>
</div>
{footer}