Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/old/changelogentry.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 |
---|---|
2132
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1606
diff
changeset
|
1 <table class="logEntry parity#parity#"> |
585 | 2 <tr> |
2132
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1606
diff
changeset
|
3 <th class="age">#date|age# ago:</th> |
1445
56281e086f38
hgweb: add strip and rstrip filters to handle summary
TK Soh <teekaysoh@yahoo.com>
parents:
1416
diff
changeset
|
4 <th class="firstline">#desc|strip|firstline|escape#</th> |
585 | 5 </tr> |
6 <tr> | |
2132
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1606
diff
changeset
|
7 <th class="revision">changeset #rev#:</th> |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1606
diff
changeset
|
8 <td class="node"><a href="?cs=#node|short#">#node|short#</a></td> |
585 | 9 </tr> |
1416
19d2776f1725
hgweb: hide trivial parent (like in show_changeset)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1410
diff
changeset
|
10 #parent%changelogparent# |
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1445
diff
changeset
|
11 #child%changelogchild# |
585 | 12 #changelogtag# |
13 <tr> | |
14 <th class="author">author:</th> | |
15 <td class="author">#author|obfuscate#</td> | |
16 </tr> | |
17 <tr> | |
18 <th class="date">date:</th> | |
19 <td class="date">#date|date#</td> | |
20 </tr> | |
21 <tr> | |
3205 | 22 <th class="files"><a href="?mf=#node|short#;path=/">files</a>:</th> |
585 | 23 <td class="files">#files#</td> |
24 </tr> | |
1334
0843e1bf2b97
hgweb: fixed IE display problem on changelog page
TK Soh <teekaysoh@yahoo.com>
parents:
585
diff
changeset
|
25 </table> |