Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use hex() to convert the hash to bytes
authorPulkit Goyal <7895pulkit@gmail.com>
Mon, 26 Jun 2017 17:20:46 +0530
changeset 33095 9fc880dff5f3
parent 33094 4c5af472a599
child 33096 d9962854a4a2
py3: use hex() to convert the hash to bytes
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Sat Jun 24 19:57:50 2017 +0530
+++ b/mercurial/merge.py	Mon Jun 26 17:20:46 2017 +0530
@@ -414,7 +414,7 @@
         if fcl.isabsent():
             hash = nullhex
         else:
-            hash = hashlib.sha1(fcl.path()).hexdigest()
+            hash = hex(hashlib.sha1(fcl.path()).digest())
             self._repo.vfs.write('merge/' + hash, fcl.data())
         self._state[fd] = ['u', hash, fcl.path(),
                            fca.path(), hex(fca.filenode()),
Mercurial