Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/old/filelog.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 | 46c5e1ee8aaa |
children |
rev | line source |
---|---|
142 | 1 #header# |
1650
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1433
diff
changeset
|
2 <title>#repo|escape#: #file|escape# history</title> |
5266
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
3263
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:
3263
diff
changeset
|
4 href="#url#atom-log/tip/#file|urlescape#" title="Atom feed for #repo|escape#:#file#"> |
661
148f642d1f8e
Add rss tag in the changelog/filelog html template.
kreijack@inwind.REMOVEME.it
parents:
599
diff
changeset
|
5 <link rel="alternate" type="application/rss+xml" |
1650
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1433
diff
changeset
|
6 href="?fl=0;file=#file|urlescape#;style=rss" title="RSS feed for #repo|escape#:#file#"> |
661
148f642d1f8e
Add rss tag in the changelog/filelog html template.
kreijack@inwind.REMOVEME.it
parents:
599
diff
changeset
|
7 </head> |
142 | 8 </head> |
138 | 9 <body> |
10 | |
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
153
diff
changeset
|
11 <div class="buttons"> |
1433
70a3b6a505c6
hgweb: fix broken filelog->changelog link
TK Soh <teekaysoh@yahoo.com>
parents:
1410
diff
changeset
|
12 <a href="?cl=tip">changelog</a> |
2687
46b19175fec6
[hgweb] links to shortlog for the default templates
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
1650
diff
changeset
|
13 <a href="?sl=tip">shortlog</a> |
1410
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
981
diff
changeset
|
14 <a href="?tags=">tags</a> |
3206
79fd7a92f3e2
hgweb: kill off #filenode#
Brendan Cully <brendan@kublai.com>
parents:
2687
diff
changeset
|
15 <a href="?f=#node|short#;file=#file|urlescape#">file</a> |
79fd7a92f3e2
hgweb: kill off #filenode#
Brendan Cully <brendan@kublai.com>
parents:
2687
diff
changeset
|
16 <a href="?fa=#node|short#;file=#file|urlescape#">annotate</a> |
1650
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1433
diff
changeset
|
17 <a type="application/rss+xml" href="?fl=0;file=#file|urlescape#;style=rss">rss</a> |
5266
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
3263
diff
changeset
|
18 <a type="application/atom+xml" href="#url#atom-log/tip/#file|urlescape#" title="Atom feed for #repo|escape#:#file#">atom</a> |
142 | 19 </div> |
138 | 20 |
1650
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1433
diff
changeset
|
21 <h2>#file|escape# revision history</h2> |
138 | 22 |
978
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
661
diff
changeset
|
23 #entries%filelogentry# |
138 | 24 |
142 | 25 #footer# |