Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 33107:9fc880dff5f3

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
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 26 Jun 2017 17:20:46 +0530
parents eb4c49f55f1f
children 7017567ebdf2
line wrap: on
line diff
--- 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()),