##// END OF EJS Templates
tests: test divergence created during interrupted rebase...
tests: test divergence created during interrupted rebase If a rebase runs into conflicts and the user somehow rewrites an unrebased commit in the rebase set while the rebase is interrupted, continuing it might result in divergence. It turns out that we decide to skip the commit. That seems to make sense, but it wasn't obvious to me that that's what we should do. Either way, this patch adds a test case for the current behavior. Differential Revision: https://phab.mercurial-scm.org/D10256

File last commit:

r35052:e9a8a941 default
r47586:6648307d default
Show More
changelogentry.tmpl
11 lines | 467 B | application/x-cheetah | CheetahLexer
av6
hgweb: split long lines in gitweb and monoblue (changeset summary and tags)
r35051 <h3 class="changelog">
<a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
{desc|strip|firstline|escape|nonempty}
av6
hgweb: move changeset "tags" to a template in map file (gitweb and monoblue)...
r35052 {alltags}
av6
hgweb: split long lines in gitweb and monoblue (changeset summary and tags)
r35051 </a>
</h3>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <ul class="changelog-entry">
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <li class="age">{date|rfc822date}</li>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <li>by <span class="name">{author|obfuscate}</span> <span class="revdate">[{date|rfc822date}] rev {rev}</span></li>
Angel Ezquerra
hgweb: apply the websub filter to revision descriptions...
r18628 <li class="description">{desc|strip|escape|websub|addbreaks|nonempty}</li>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </ul>