changeset 36719 | 390d16ea7c76 |
parent 36615 | ed7705017749 |
child 36760 | 7bf80d9d9543 |
--- a/mercurial/wireproto.py Sun Mar 04 07:40:21 2018 -0800 +++ b/mercurial/wireproto.py Sun Mar 04 22:33:59 2018 +0530 @@ -1043,7 +1043,7 @@ util.stderr.write("(%s)\n" % exc.hint) return pushres(0, output.getvalue() if output else '') except error.PushRaced: - return pusherr(str(exc), + return pusherr(pycompat.bytestr(exc), output.getvalue() if output else '') bundler = bundle2.bundle20(repo.ui)