Mercurial > hg
view mercurial/templates/spartan/changeset.tmpl @ 28686:b212e01fead0
rebase: fix crash when rebase aborts while rebasing obsolete revisions
Before this patch, rebase --continue would crash when trying to resume a rebase
of obsolete revisions whose successors were in the destination.
This patch adds logic to recompute the mapping when rebase is resumed. This
patch also adds a test that showcased the crash before the code change.
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Tue, 29 Mar 2016 11:50:41 -0700 |
parents | 902148444889 |
children | a1de4ffaa7a8 |
line wrap: on
line source
{header} <title>{repo|escape}: changeset {node|short}</title> </head> <body> <div class="buttons"> <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> <a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a> <a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a> <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> <a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a> <a href="{url|urlescape}raw-rev/{symrev}">raw</a> {archives%archiveentry} <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a> </div> <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / changeset: {desc|strip|escape|firstline|nonempty}</h2> <table id="changesetEntry"> <tr> <th class="changeset">changeset {rev}:</th> <td class="changeset"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td> </tr> {ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)} {child%changesetchild} {changesettag} <tr> <th class="author">author:</th> <td class="author">{author|obfuscate}</td> </tr> <tr> <th class="date">date:</th> <td class="date age">{date|rfc822date}</td> </tr> <tr> <th class="files">files:</th> <td class="files">{files}</td> </tr> <tr> <th class="description">description:</th> <td class="description">{desc|strip|escape|websub|addbreaks|nonempty}</td> </tr> </table> <div id="changesetDiff"> {diff} </div> {footer}