Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templates/error.tmpl
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 03 Jul 2006 19:14:29 +0200
changeset 2548 0229ff95faec
parent 1554 68ec7b9e09a4
permissions -rw-r--r--
Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1554
68ec7b9e09a4 Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     1
 
#header#
68ec7b9e09a4 Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     2
 
<title>Mercurial Error</title>
68ec7b9e09a4 Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     3
 
</head>
68ec7b9e09a4 Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     4
 
<body>
68ec7b9e09a4 Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     5
 












68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




     6


<h2>Mercurial Error</h2>













68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




     7














68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




     8


<p>













68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




     9


An error occured while processing your request:













68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    10


</p>













68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    11


<p>













68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    12


#error|escape#













68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    13


</p>













68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    14














68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    15


#footer#















mercurial-crew-with-dirclash