Mercurial > hg
diff mercurial/dirstate.py @ 39452:481db51c83e9
merge with stable
Includes an extra bump of the version number for parsers because the
merge produces a new, distinct version of the code.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Wed, 05 Sep 2018 09:36:31 -0700 |
parents | 27946fca8a05 adacefb0b7ea |
children | 24e493ec2229 |
line wrap: on
line diff
--- a/mercurial/dirstate.py Tue Sep 04 10:22:42 2018 -0700 +++ b/mercurial/dirstate.py Wed Sep 05 09:36:31 2018 -0700 @@ -1405,9 +1405,9 @@ l = len(st) if l == 40: - self._parents = st[:20], st[20:40] + self._parents = (st[:20], st[20:40]) elif l == 0: - self._parents = [nullid, nullid] + self._parents = (nullid, nullid) else: raise error.Abort(_('working directory state appears ' 'damaged!'))