##// END OF EJS Templates
graft: fix collision detection with origin revisions that are missing...
graft: fix collision detection with origin revisions that are missing When grafting something with a matching origin, it would normally be skipped: skipping already grafted revision 123 (23 also has origin 12) But after stripping a graft origin, graft could fail with a reference to the origin that no longer exists: abort: unknown revision '5c095ad7e90f871700f02dd1fa5012cb4498a2d4'! Instead, detect that the origin is unknown and skip it anyway, like: skipping already grafted revision 8 (2 also has unknown origin 5c095ad7e90f871700f02dd1fa5012cb4498a2d4)

File last commit:

r19795:ac08ff37 default
r22302:9472284d stable
Show More
search.tmpl
64 lines | 1.8 KiB | application/x-cheetah | CheetahLexer
{header}
<title>{repo|escape}: searching for {query|escape}</title>
</head>
<body>
<div class="container">
<div class="menu">
<div class="logo">
<a href="{logourl}">
<img src="{staticurl|urlescape}{logoimg}" width=75 height=90 border=0 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><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
<li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
</ul>
</div>
<div class="main">
<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
<h3>searching for '{query|escape}'</h3>
<p>
Assuming {modedesc}.
{if(showforcekw, '<a href="{url|urlescape}log?rev={query|urlescape}&forcekw=1">
Use {showforcekw}</a> instead.')}
{if(showunforcekw, '<a href="{url|urlescape}log?rev={query|urlescape}">
Use {showunforcekw}</a> instead.')}
</p>
<form class="search" action="{url|urlescape}log">
{sessionvars%hiddenformentry}
<p><input name="rev" id="search1" type="text" size="30" value="{query|escape}"></p>
<div id="hint">{searchhint}</div>
</form>
<div class="navigate">
<a href="{url|urlescape}search/{lessvars%urlparameter}">less</a>
<a href="{url|urlescape}search/{morevars%urlparameter}">more</a>
</div>
<table class="bigtable">
<tr>
<th class="age">age</th>
<th class="author">author</th>
<th class="description">description</th>
</tr>
<tbody class="stripes2">
{entries}
</tbody>
</table>
<div class="navigate">
<a href="{url|urlescape}search/{lessvars%urlparameter}">less</a>
<a href="{url|urlescape}search/{morevars%urlparameter}">more</a>
</div>
</div>
</div>
{footer}