diff --git a/mercurial/destutil.py b/mercurial/destutil.py --- a/mercurial/destutil.py +++ b/mercurial/destutil.py @@ -13,6 +13,7 @@ error, obsutil, scmutil, + stack ) def _destupdateobs(repo, clean): @@ -355,9 +356,7 @@ return None def stackbase(ui, repo): - # The histedit default base stops at public changesets, branchpoints, - # and merges, which is exactly what we want for a stack. - revs = scmutil.revrange(repo, [histeditdefaultrevset]) + revs = stack.getstack(repo) return revs.last() if revs else None def _statusotherbook(ui, repo):