Mercurial > hg > mercurial-crew-with-dirclash

view templates/changelogentry.tmpl @ 146:4a828422247d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle merge with deletions If you merge with a repo that has deleted a file after editing it, hg attempted to resolve the file. This (correctly) resulted in hg verify errors because the resolved version didn't show up in the manifests. This moves the manifest resolution before file resolution and decides which files to resolve based on the (partially) resolved manifest. After files are resolved, the final manifest is committed.
author mpm@selenic.com
date Tue, 24 May 2005 20:30:35 -0800
parents 529bf610092e
children 1d5f799ebe1e 083c38bdfa64
line wrap: on
line source

<div class=parity#parity#>
<table width=100% cellpadding=0 cellspacing=0>
<tr>
 <td align=right width="15%"><b>#age# ago:&nbsp;</b></td>
 <td><b>#shortdesc#</b></td</tr>
<tr>
 <td align=right>revision:&nbsp;</td>
 <td><a href="?cmd=changeset;node=#node#">#rev#:#node#</a></td></tr>
#parent1#
#parent2#
<tr>
 <td align=right>manifest:&nbsp;</td>
 <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#rev#:#manifest#</a></td></tr>
<tr>
 <td align=right>author:&nbsp;</td>
 <td>#author#</td></tr>
<tr>
 <td align=right>date:&nbsp;</td>
 <td>#date#</td></tr>
<tr>
 <td align=right valign=top>files:&nbsp;</td>
 <td>#files#</td></tr>
</table>
</div>