quark added a comment. I think a most flexible solution is to not do the check if there is nothing to rebase. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3986 To: martinvonz, #hg-reviewers Cc: quark, mercurial-devel