Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/old/manifest.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 | fc34c031ff54 |
children |
rev | line source |
---|---|
142 | 1 #header# |
3205 | 2 <title>#repo|escape#: manifest for changeset #node|short#</title> |
142 | 3 </head> |
138 | 4 <body> |
5 | |
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
153
diff
changeset
|
6 <div class="buttons"> |
1410
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
1370
diff
changeset
|
7 <a href="?cl=#rev#">changelog</a> |
2687
46b19175fec6
[hgweb] links to shortlog for the default templates
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
1650
diff
changeset
|
8 <a href="?sl=#rev#">shortlog</a> |
1410
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
1370
diff
changeset
|
9 <a href="?tags=">tags</a> |
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
1370
diff
changeset
|
10 <a href="?cs=#node|short#">changeset</a> |
1498
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1410
diff
changeset
|
11 #archives%archiveentry# |
142 | 12 </div> |
138 | 13 |
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:
1498
diff
changeset
|
14 <h2>manifest for changeset #node|short#: #path|escape#</h2> |
138 | 15 |
359 | 16 <table cellpadding="0" cellspacing="0"> |
17 <tr class="parity1"> | |
18 <td><tt>drwxr-xr-x</tt> | |
3205 | 19 <td><a href="?mf=#node|short#;path=#up|urlescape#">[up]</a> |
979
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
377
diff
changeset
|
20 #dentries%manifestdirentry# |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
377
diff
changeset
|
21 #fentries%manifestfileentry# |
359 | 22 </table> |
153
e8a360cd5a9f
changed pos to rev for changelog cmd, changed & to ;
jake@edge2.net
parents:
142
diff
changeset
|
23 #footer# |