Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/old/changeset.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# |
| 375 | 2 <title>#repo|escape#: changeset #node|short#</title> |
| 142 | 3 </head> |
| 4 <body> | |
| 138 | 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:
1606
diff
changeset
|
8 <a href="?sl=#rev#">shortlog</a> |
| 168 | 9 <a href="?cmd=tags">tags</a> |
| 3205 | 10 <a href="?mf=#node|short#;path=/">manifest</a> |
|
1410
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
1370
diff
changeset
|
11 <a href="?cs=#node|short#;style=raw">raw</a> |
| 1078 | 12 #archives%archiveentry# |
| 142 | 13 </div> |
| 138 | 14 |
|
1445
56281e086f38
hgweb: add strip and rstrip filters to handle summary
TK Soh <teekaysoh@yahoo.com>
parents:
1417
diff
changeset
|
15 <h2>changeset: #desc|strip|escape|firstline#</h2> |
| 138 | 16 |
| 602 | 17 <table id="changesetEntry"> |
| 138 | 18 <tr> |
| 602 | 19 <th class="changeset">changeset #rev#:</th> |
|
1410
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
1370
diff
changeset
|
20 <td class="changeset"><a href="?cs=#node|short#">#node|short#</a></td> |
| 602 | 21 </tr> |
|
1416
19d2776f1725
hgweb: hide trivial parent (like in show_changeset)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1412
diff
changeset
|
22 #parent%changesetparent# |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1445
diff
changeset
|
23 #child%changesetchild# |
| 568 | 24 #changesettag# |
| 138 | 25 <tr> |
| 602 | 26 <th class="author">author:</th> |
| 27 <td class="author">#author|obfuscate#</td> | |
| 28 </tr> | |
| 138 | 29 <tr> |
| 602 | 30 <th class="date">date:</th> |
| 31 <td class="date">#date|date# (#date|age# ago)</td></tr> | |
| 138 | 32 <tr> |
| 602 | 33 <th class="files">files:</th> |
| 34 <td class="files">#files#</td></tr> | |
| 138 | 35 <tr> |
| 602 | 36 <th class="description">description:</th> |
|
1445
56281e086f38
hgweb: add strip and rstrip filters to handle summary
TK Soh <teekaysoh@yahoo.com>
parents:
1417
diff
changeset
|
37 <td class="description">#desc|strip|escape|addbreaks#</td> |
| 602 | 38 </tr> |
| 138 | 39 </table> |
| 40 | |
|
672
dbe0ce2ae196
More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents:
602
diff
changeset
|
41 <div id="changesetDiff"> |
| 138 | 42 #diff# |
| 602 | 43 </div> |
| 138 | 44 |
|
1417
90b62337f8dd
hgweb: add a mercurial link to the footer
Matt Mackall <mpm@selenic.com>
parents:
1416
diff
changeset
|
45 #footer# |
| 138 | 46 |
| 47 |