##// END OF EJS Templates
reabase: call rewriteutil.precheck() a bit later...
reabase: call rewriteutil.precheck() a bit later We now filter out descendants of divergence-causing commits in `_handleskippingobsolete()`. The filtered-out commits are removed from the rebase set (`destmap` and `state`). We should therefore call `rewriteutil.precheck()` after `_handleskippingobsolete()`. This patch does that. It hasn't mattered so far because `rewriteutil.precheck()` doesn't yet check for divergence, but it will soon. This affects one test where we now fail because the user is trying to rebase an ancestor instead of failing because they tried to rebase a public commit. We have several similar tests just after, where we still fail because of the phase, so that seems fine. The difference in behavior also seems fine to me. Differential Revision: https://phab.mercurial-scm.org/D10258

File last commit:

r20255:b1d65cb8 default
r47592:80cac993 default
Show More
header.tmpl
7 lines | 389 B | application/x-cheetah | CheetahLexer
Takumi IINO
hgweb: infinite scroll support for monoblue style
r20255 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <html>
<head>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <link rel="icon" href="{staticurl|urlescape}hgicon.png" type="image/png">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <meta name="robots" content="index, nofollow" />
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <link rel="stylesheet" href="{staticurl|urlescape}style.css" type="text/css" />
<script type="text/javascript" src="{staticurl|urlescape}mercurial.js"></script>