Mercurial > public > mercurial-scm > hg
diff mercurial/repair.py @ 43793:29adf0a087a1
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Thu, 05 Dec 2019 11:15:19 -0500 |
| parents | c21aca51b392 8accf5fa9930 |
| children | a61287a95dc3 |
line wrap: on
line diff
--- a/mercurial/repair.py Tue Dec 03 17:17:57 2019 -0800 +++ b/mercurial/repair.py Thu Dec 05 11:15:19 2019 -0500 @@ -131,7 +131,7 @@ cl = repo.changelog # TODO handle undo of merge sets - if isinstance(nodelist, str): + if isinstance(nodelist, bytes): nodelist = [nodelist] striplist = [cl.rev(node) for node in nodelist] striprev = min(striplist)