Mercurial > hg
view mercurial/templates/spartan/filelogentry.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 | 8b79fdaa9f85 |
children |
line wrap: on
line source
<table class="logEntry parity{parity}"> <tr> <th class="label"><span class="age">{date|rfc822date}</span>:</th> <th class="firstline"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></th> </tr> <tr> <th class="revision">revision {filerev}:</th> <td class="node"> <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a> <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">(diff)</a> <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">(annotate)</a> </td> </tr> {rename%filelogrename} <tr> <th class="author">author:</th> <td class="author">{author|obfuscate}</td> </tr> <tr> <th class="date">date:</th> <td class="date">{date|rfc822date}</td> </tr> </table>