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/index.tmpl
author mpm@selenic.com
Sun, 21 Aug 2005 21:59:55 -0700
changeset 990 5007e0bdeed2
parent 982 8d2e24bae760
child 1070 b55c6685c953
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:
941
4cf418c2a013 Add a multi-repository server
mpm@selenic.com
parents:
diff changeset 
     1
 
#header#
4cf418c2a013 Add a multi-repository server
mpm@selenic.com
parents:
diff changeset 
     2
 
<title>Mercurial repositories index</title>
4cf418c2a013 Add a multi-repository server
mpm@selenic.com
parents:
diff changeset 
     3
 
</head>
4cf418c2a013 Add a multi-repository server
mpm@selenic.com
parents:
diff changeset 
     4
 
<body>
4cf418c2a013 Add a multi-repository server
mpm@selenic.com
parents:
diff changeset 
     5
 












4cf418c2a013
Add a multi-repository server



mpm@selenic.com


parents: 

diff
changeset




     6


<h2>Mercurial Repositories</h2>













4cf418c2a013
Add a multi-repository server



mpm@selenic.com


parents: 

diff
changeset




     7














4cf418c2a013
Add a multi-repository server



mpm@selenic.com


parents: 

diff
changeset




     8


<table>













4cf418c2a013
Add a multi-repository server



mpm@selenic.com


parents: 

diff
changeset




     9


    <tr>













4cf418c2a013
Add a multi-repository server



mpm@selenic.com


parents: 

diff
changeset




    10


        <td>Name</td>













4cf418c2a013
Add a multi-repository server



mpm@selenic.com


parents: 

diff
changeset




    11


        <td>Description</td>













4cf418c2a013
Add a multi-repository server



mpm@selenic.com


parents: 

diff
changeset




    12


        <td>Author</td>













4cf418c2a013
Add a multi-repository server



mpm@selenic.com


parents: 

diff
changeset




    13


        <td>Last change</td>













4cf418c2a013
Add a multi-repository server



mpm@selenic.com


parents: 

diff
changeset




    14


    <tr>








982






8d2e24bae760
hgweb: convert index entries to list expansion style



mpm@selenic.com


parents: 
941

diff
changeset




    15


    #entries%indexentry#








941






4cf418c2a013
Add a multi-repository server



mpm@selenic.com


parents: 

diff
changeset




    16


</table>













4cf418c2a013
Add a multi-repository server



mpm@selenic.com


parents: 

diff
changeset




    17














4cf418c2a013
Add a multi-repository server



mpm@selenic.com


parents: 

diff
changeset




    18


#footer#















mercurial-crew-with-dirclash