annotate templates/changelogentry.tmpl @ 275:61d45b0ba8fb

various merge improvements -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 various merge improvements add -C flag: force update and overwrite local changes add -m flag: allow merges with conflicts we no longer do merge by default and we print a warning message when the merge fails fix bug in printing merge failure message fix bug diffing files in 'm' state manifest hash: 75545a6db45d1e371082343d01c9f177df0f9db3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpm6tywK+sNU5EO8RAvb+AJ0euC3YkUYA944hds3ooPxbw6NpVwCfc1dj TiNsPIds560S5jgw44eWNto= =GPXN -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 07 Jun 2005 20:06:05 -0800
parents afe895fcc0d0
children b29219389b00 e5d769afd3ef
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 142
diff changeset
1 <div class="parity#parity#">
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 142
diff changeset
2 <table width="100%" cellpadding="0" cellspacing="0">
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
3 <tr>
201
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents: 173
diff changeset
4 <td align="right" width="15%"><b>#date|age# ago:&nbsp;</b></td>
233
33c48b635690 Add missing > to </td> in templates.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 201
diff changeset
5 <td><b>#desc|firstline|escape#</b></td></tr>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
6 <tr>
167
fad9ad1ec7c7 Hide most revision numbers in hgweb
mpm@selenic.com
parents: 155
diff changeset
7 <td align="right">changeset #rev#:&nbsp;</td>
fad9ad1ec7c7 Hide most revision numbers in hgweb
mpm@selenic.com
parents: 155
diff changeset
8 <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
9 #parent1#
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
10 #parent2#
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
11 <tr>
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 142
diff changeset
12 <td align="right">author:&nbsp;</td>
235
eb341488aa4c Obfuscate author in all HTML templates.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 233
diff changeset
13 <td>#author|obfuscate#</td></tr>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
14 <tr>
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 142
diff changeset
15 <td align="right">date:&nbsp;</td>
201
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents: 173
diff changeset
16 <td>#date|date#</td></tr>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
17 <tr>
173
8da1df932c16 hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents: 167
diff changeset
18 <td align="right" valign="top"><a href="?cmd=manifest;manifest=#manifest#;path=/">files</a>:&nbsp;</td>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
19 <td>#files#</td></tr>
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
20 </table>
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
21 </div>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
22