Mercurial > hg
changeset 24583:6117a29e9e76
changeset_printer: handle workingctx in _meaningful_parentrevs()
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 14 Mar 2015 17:29:48 +0900 |
parents | 56fff44cce98 |
children | 5a40b5d45396 |
files | mercurial/cmdutil.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Sat Mar 14 19:38:59 2015 +0900 +++ b/mercurial/cmdutil.py Sat Mar 14 17:29:48 2015 +0900 @@ -1237,7 +1237,7 @@ return parents if self.ui.debugflag: return [parents[0], self.repo['null']] - if parents[0].rev() >= ctx.rev() - 1: + if parents[0].rev() >= scmutil.intrev(self.repo, ctx.rev()) - 1: return [] return parents