Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/header.tmpl @ 5483:0c43f87baba3 default tip
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 | 51e52db6b40d |
children |
rev | line source |
---|---|
3782
713e35dcc321
hgweb: report detected character set
Matt Mackall <mpm@selenic.com>
parents:
3264
diff
changeset
|
1 Content-type: text/html; charset={encoding} |
142 | 2 |
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
142
diff
changeset
|
3 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> |
142 | 4 <html> |
5 <head> | |
4084
51e52db6b40d
hgweb: allow static files to be served directly by the HTTP server
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3782
diff
changeset
|
6 <link rel="icon" href="#staticurl#hgicon.png" type="image/png"> |
1628
88ad18c16ae5
[hgweb] Prevent search engine bots from indexing the entire repository
Matt Mackall <mpm@selenic.com>
parents:
1425
diff
changeset
|
7 <meta name="robots" content="index, nofollow" /> |
4084
51e52db6b40d
hgweb: allow static files to be served directly by the HTTP server
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3782
diff
changeset
|
8 <link rel="stylesheet" href="#staticurl#style.css" type="text/css" /> |