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 mpm@selenic.com
Tue, 21 Jun 2005 18:41:57 -0800
changeset 407 0e0d0670b2bc
parent 377 e5d769afd3ef
child 568 e8fd41110dce
permissions -rw-r--r--
[PATCH] Merging identical changes from another branch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Merging identical changes from another branch From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> The issue comes up when a local uncommitted *new* file (i.e. not in the current manifest) is being merged with an identical file from a branch. Since the file is not in the current manifest (it's either in the current "to-be-added" list, or in the "unknown" state), there's no (local) node from which to create a mergepoint. manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01 92uuMswZXcoCchQAaxew7C0= =qRsk -----END PGP SIGNATURE-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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>
375
b29219389b00 Show nice short hashes in hgweb
mpm@selenic.com
parents: 241
diff changeset 
     8
 
 <td><a href="?cmd=changeset;node=#node#">#node|short#</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
 














mercurial-crew-with-dirclash