##// END OF EJS Templates
dirstate: fix restoration of "merged" state after a remove...
dirstate: fix restoration of "merged" state after a remove Before this change, "merged" file that get removed and re-added later were recorded as "from_p2" instead. This came from 8fe74328f700, a 2014 changeset that start explicitly doing so for reason I have not been able to fully grasp. The graft test mentioned in the description are still happy after this changeset. So this changeset restore what seems to be the intended behavior. Restoring information as it was before the removal. Differential Revision: https://phab.mercurial-scm.org/D11429

File last commit:

r24054:fdf7794b default
r48803:87b3010c default
Show More
index.tmpl
31 lines | 795 B | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
<title>Mercurial repositories index</title>
</head>
<body>
<div class="container">
<div class="menu">
Steven Stallion
hgweb: support alternate logo url...
r13964 <a href="{logourl}">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <img src="{staticurl|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial" /></a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
<div class="main">
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258 <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999
<table class="bigtable">
Anton Shestakov
hgweb: replace implicit <tbody> with explicit <thead> where appropriate...
r24054 <thead>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <tr>
<th><a href="?sort={sort_name}">Name</a></th>
<th><a href="?sort={sort_description}">Description</a></th>
<th><a href="?sort={sort_contact}">Contact</a></th>
Dan Villiom Podlaski Christiansen
templates: rename `Last change' column in hgwebdir repository list....
r10301 <th><a href="?sort={sort_lastchange}">Last modified</a></th>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <th>&nbsp;</th>
Angel Ezquerra
hgweb, paper: add (Atom) subscribe links to the repository index...
r18201 <th>&nbsp;</th>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </tr>
Anton Shestakov
hgweb: replace implicit <tbody> with explicit <thead> where appropriate...
r24054 </thead>
Alexander Plavin
hgweb: make stripes in repo list with CSS
r19450 <tbody class="stripes2">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {entries%indexentry}
Alexander Plavin
hgweb: make stripes in repo list with CSS
r19450 </tbody>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </table>
</div>
</div>
{footer}