Mercurial > hg > mercurial-crew-with-dirclash
view templates/filelogentry.tmpl @ 4696:59b8f9361545
tests: add merge test for changeset 9fe267f77f56
When all the files in a directory are moved somewhere else, and new
files are added in changesets of the local branch, a subsequent pull
and merge shouldn't rename the locally added files too.
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Sat, 23 Jun 2007 22:43:46 -0500 |
parents | ce8f31e0b3b8 |
children |
line wrap: on
line source
<table class="logEntry parity#parity#"> <tr> <th class="age">#date|age# ago:</th> <th class="firstline"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#desc|strip|firstline|escape#</a></th> </tr> <tr> <th class="revision">revision #filerev#:</td> <td class="node"> <a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a> <a href="#url#diff/#node|short#/#file|urlescape#{sessionvars%urlparameter}">(diff)</a> <a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">(annotate)</a> </td> </tr> #rename%filelogrename# <tr> <th class="author">author:</th> <td class="author">#author|obfuscate#</td> </tr> <tr> <th class="date">date:</th> <td class="date">#date|date#</td> </tr> </table>