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/filelog.tmpl
author mpm@selenic.com
Tue, 21 Jun 2005 18:41:57 -0800
changeset 407 0e0d0670b2bc
parent 201 f918a6fa2572
child 599 765182a4c843
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:
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset 
     1
 
#header#
201
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents: 168
diff changeset 
     2
 
<title>#repo|escape#: #file# history</title>
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset 
     3
 
</head>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
     4
 
<body>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
     5
 







154






1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes



jake@edge2.net


parents: 
153

diff
changeset




     6


<div class="buttons">








138






c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




     7


<a href="?cmd=changelog">changelog</a>








168






65cf1b0cfe86
hgweb: add tags links and manifest links



mpm@selenic.com


parents: 
155

diff
changeset




     8


<a href="?cmd=tags">tags</a>








153






e8a360cd5a9f
changed pos to rev for changelog cmd, changed & to ;



jake@edge2.net


parents: 
142

diff
changeset




     9


<a href="?cmd=file;file=#file#;filenode=#filenode#">file</a>













e8a360cd5a9f
changed pos to rev for changelog cmd, changed & to ;



jake@edge2.net


parents: 
142

diff
changeset




    10


<a href="?cmd=annotate;file=#file#;filenode=#filenode#">annotate</a>








142






529bf610092e
Prettify the web interface



mpm@selenic.com


parents: 
138

diff
changeset




    11


</div>








138






c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    12














c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    13


<h2>#file# revision history</h2>













c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    14














c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    15


#entries#













c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    16









142






529bf610092e
Prettify the web interface



mpm@selenic.com


parents: 
138

diff
changeset




    17


#footer#















mercurial-crew-with-dirclash