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/manifest.tmpl
author mpm@selenic.com
Sun, 21 Aug 2005 21:59:55 -0700
changeset 990 5007e0bdeed2
parent 981 4f81068ed8cd
child 1370 710079d2a821
permissions -rw-r--r--
Fix long-standing excessive file merges Since switching to the multihead approach, we've been creating excessive file-level merges where files are marked as merged with their ancestors. This explicitly checks at commit time whether the two parent versions are linearly related, and if so, reduces the file check-in to a non-merge. Then the file is compared against the remaining parent, and, if equal, skips check-in of that file (as it's not changed). Since we're not checking in all files that were different between versions, we no longer need to mark so many files for merge. This removes most of the 'm' state marking as well. Finally, it is possible to do a tree-level merge with no file-level changes. This will happen if one user changes file A and another changes file B. Thus, if we have have two parents, we allow commit to proceed even if there are no file-level changes.
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#
375
b29219389b00 Show nice short hashes in hgweb
mpm@selenic.com
parents: 359
diff changeset 
     2
 
<title>#repo|escape#: manifest #manifest|short#</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">








153






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



jake@edge2.net


parents: 
142

diff
changeset




     7


<a href="?cmd=changelog;rev=#rev#">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=changeset;node=#node#">changeset</a>








142






529bf610092e
Prettify the web interface



mpm@selenic.com


parents: 
138

diff
changeset




    10


</div>








138






c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    11









375






b29219389b00
Show nice short hashes in hgweb



mpm@selenic.com


parents: 
359

diff
changeset




    12


<h2>manifest #manifest|short#: #path#</h2>








138






c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    13









359






0c4688e9ee5c
hgweb: add file permissions



mpm@selenic.com


parents: 
201

diff
changeset




    14


<table cellpadding="0" cellspacing="0">













0c4688e9ee5c
hgweb: add file permissions



mpm@selenic.com


parents: 
201

diff
changeset




    15


<tr class="parity1">













0c4688e9ee5c
hgweb: add file permissions



mpm@selenic.com


parents: 
201

diff
changeset




    16


  <td><tt>drwxr-xr-x</tt>&nbsp;













0c4688e9ee5c
hgweb: add file permissions



mpm@selenic.com


parents: 
201

diff
changeset




    17


  <td><a href="?cmd=manifest;manifest=#manifest#;path=#up#">[up]</a>








979






87d40e085e08
hgweb: Changed manifest page to list format syntax



Josef "Jeff" Sipek <jeffpc@optonline.net>


parents: 
377

diff
changeset




    18


#dentries%manifestdirentry#













87d40e085e08
hgweb: Changed manifest page to list format syntax



Josef "Jeff" Sipek <jeffpc@optonline.net>


parents: 
377

diff
changeset




    19


#fentries%manifestfileentry#








359






0c4688e9ee5c
hgweb: add file permissions



mpm@selenic.com


parents: 
201

diff
changeset




    20


</table>








153






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



jake@edge2.net


parents: 
142

diff
changeset




    21


#footer#















mercurial-crew-with-dirclash