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/tags.tmpl
author mpm@selenic.com
Sun, 21 Aug 2005 21:59:55 -0700
changeset 990 5007e0bdeed2
parent 981 4f81068ed8cd
child 1410 17703aa4491e
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:
169
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset 
     1
 
#header#
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset 
     2
 
<title>#repo#: tags</title>
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset 
     3
 
</head>
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset 
     4
 
<body>
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset 
     5
 












e93a16de0c66
hgweb: actually commit the tags template



mpm@selenic.com


parents: 

diff
changeset




     6


<div class="buttons">













e93a16de0c66
hgweb: actually commit the tags template



mpm@selenic.com


parents: 

diff
changeset




     7


<a href="?cmd=changelog;rev=#rev#">changelog</a>













e93a16de0c66
hgweb: actually commit the tags template



mpm@selenic.com


parents: 

diff
changeset




     8


<a href="?cmd=manifest;manifest=#manifest#;path=/">manifest</a>













e93a16de0c66
hgweb: actually commit the tags template



mpm@selenic.com


parents: 

diff
changeset




     9


</div>













e93a16de0c66
hgweb: actually commit the tags template



mpm@selenic.com


parents: 

diff
changeset




    10














e93a16de0c66
hgweb: actually commit the tags template



mpm@selenic.com


parents: 

diff
changeset




    11


<h2>tags:</h2>













e93a16de0c66
hgweb: actually commit the tags template



mpm@selenic.com


parents: 

diff
changeset




    12









586






11578820b5d7
[PATCH] Tags template cleanup



mpm@selenic.com


parents: 
169

diff
changeset




    13


<ul id="tagEntries">








974






aedb47764f29
Added support for #foo%bar# syntax



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


parents: 
586

diff
changeset




    14


#entries%tagentry#








586






11578820b5d7
[PATCH] Tags template cleanup



mpm@selenic.com


parents: 
169

diff
changeset




    15


</ul>








169






e93a16de0c66
hgweb: actually commit the tags template



mpm@selenic.com


parents: 

diff
changeset




    16














e93a16de0c66
hgweb: actually commit the tags template



mpm@selenic.com


parents: 

diff
changeset




    17


#footer#















mercurial-crew-with-dirclash