changeset 39894 | d739f423bf06 |
parent 39891 | b99903534e06 |
child 39897 | a477679f6323 |
--- a/mercurial/scmutil.py Wed Sep 26 22:17:26 2018 -0700 +++ b/mercurial/scmutil.py Wed Sep 26 22:17:34 2018 -0700 @@ -21,6 +21,7 @@ bin, hex, nullid, + nullrev, short, wdirid, wdirrev, @@ -730,7 +731,7 @@ if len(parents) > 1: return parents if repo.ui.debugflag: - return [parents[0], repo['null']] + return [parents[0], repo[nullrev]] if parents[0].rev() >= intrev(ctx) - 1: return [] return parents