Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templates/changelogentry.tmpl
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 10 Aug 2005 06:47:46 +0100
changeset 862 d70c1c31fd45
parent 585 51626d888526
child 1334 0843e1bf2b97
permissions -rw-r--r--
Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
585
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
     1
 
<table class="changelogEntry parity#parity#">
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
     2
 
 <tr>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
     3
 
  <th class="age">#date|age# ago:</th>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
     4
 
  <th class="firstline">#desc|firstline|escape#</th>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
     5
 
 </tr>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
     6
 
 <tr>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
     7
 
  <th class="changesetRev">changeset #rev#:</th>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
     8
 
  <td class="changesetNode"><a href="?cmd=changeset;node=#node#">#node|short#</a></td>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
     9
 
 </tr>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
    10
 
 #parent#
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
    11
 
 #changelogtag#
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
    12
 
 <tr>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
    13
 
  <th class="author">author:</th>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
    14
 
  <td class="author">#author|obfuscate#</td>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
    15
 
 </tr>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
    16
 
 <tr>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
    17
 
  <th class="date">date:</th>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
    18
 
  <td class="date">#date|date#</td>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
    19
 
 </tr>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
    20
 
 <tr>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
    21
 
  <th class="files"><a href="?cmd=manifest;manifest=#manifest#;path=/">files</a>:</th>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
    22
 
  <td class="files">#files#</td>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
    23
 
 </tr>
51626d888526 [PATCH] Changelogentry template cleanup
mpm@selenic.com
parents: 570
diff changeset 
    24
 
</table>
mercurial-crew-with-dirclash