Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/gitweb/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:
3270
diff
changeset
|
1 Content-type: text/html; charset={encoding} |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
2 |
3782
713e35dcc321
hgweb: report detected character set
Matt Mackall <mpm@selenic.com>
parents:
3270
diff
changeset
|
3 <?xml version="1.0" encoding="{encoding}"?> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
4 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
5 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US"> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
6 <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
|
7 <link rel="icon" href="{staticurl}hgicon.png" type="image/png"> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
8 <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
|
9 <link rel="stylesheet" href="{staticurl}style-gitweb.css" type="text/css" /> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
10 |