upstream/mercurial-mirror Files · mercurial/templates/rss

rebase: stop relying on having two parents to resume rebase...

rebase: stop relying on having two parents to resume rebase I'm about to make it so we don't have two parents when a rebase is interrupted (unless we're just rebasing on a merge commit). The code for detecting if we're resuming a rebase relied on having two parents, so this patch rewrites that to instead set a boolean when we resume. Note that `self.resume` in the new condition implies `not self.inmemory` (rebase cannot be resumed in memory), so that's why that part can be omitted. Differential Revision: https://phab.mercurial-scm.org/D7826

Martin von Zweigbergk -


            r44820:b42ce825

default

Name	Size	Modified	Last Commit	Author
/ mercurial / templates / rss
bookmarkentry.tmpl	Loading ...
bookmarks.tmpl	Loading ...
branchentry.tmpl	Loading ...
branches.tmpl	Loading ...
changelog.tmpl	Loading ...
changelogentry.tmpl	Loading ...
error.tmpl	Loading ...
filelog.tmpl	Loading ...
filelogentry.tmpl	Loading ...
header.tmpl	Loading ...
map	Loading ...
tagentry.tmpl	Loading ...
tags.tmpl	Loading ...

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages