Mercurial > hg > mercurial-crew-with-dirclash

annotate templates/gitweb/error.tmpl @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents 46c5e1ee8aaa
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
1 #header#
1776
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 1572
diff changeset
2 <title>#repo|escape#: Error</title>
5266
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents: 3363
diff changeset
3 <link rel="alternate" type="application/atom+xml"
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents: 3363
diff changeset
4 href="{url}atom-log" title="Atom feed for #repo|escape#">
1776
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 1572
diff changeset
5 <link rel="alternate" type="application/rss+xml"
3270
36fa5db79dd5 hgweb: convert gitweb to NWI
Brendan Cully <brendan@kublai.com>
parents: 3226
diff changeset
6 href="{url}rss-log" title="RSS feed for #repo|escape#">
1776
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 1572
diff changeset
7 </head>
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 1572
diff changeset
8 <body>
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 1572
diff changeset
9
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 1572
diff changeset
10 <div class="page_header">
3363
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3357
diff changeset
11 <a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="{url}summary{sessionvars%urlparameter}">#repo|escape#</a> / error
1776
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 1572
diff changeset
12 </div>
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 1572
diff changeset
13
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
14 <div class="page_nav">
3363
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3357
diff changeset
15 <a href="{url}summary{sessionvars%urlparameter}">summary</a> | <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> | <a href="{url}log{sessionvars%urlparameter}">changelog</a> | <a href="{url}tags{sessionvars%urlparameter}">tags</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a><br/>
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
16 </div>
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
17
3357
7cc0f49d8e5c gitweb: Add error text to error page
Brendan Cully <brendan@kublai.com>
parents: 3270
diff changeset
18 <div class="page_body">
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
19 <br/>
1776
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 1572
diff changeset
20 <i>An error occured while processing your request</i><br/>
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
21 <br/>
3357
7cc0f49d8e5c gitweb: Add error text to error page
Brendan Cully <brendan@kublai.com>
parents: 3270
diff changeset
22 {error|escape}
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
23 </div>
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
24
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
25 #footer#