annotate templates/old/shortlogentry.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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2686
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
1 <table class="slogEntry parity#parity#">
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
2 <tr>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
3 <td class="age">#date|age#</td>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
4 <td class="author">#author|obfuscate#</td>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
5 <td class="node"><a href="?cs=#node|short#">#desc|strip|firstline|escape#</a></td>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
6 </tr>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
7 </table>