# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1585933829 -7200
# Node ID 678a9223aad393c6574a0a306213a7c834f84c87
# Parent  8c131b97e197ad0bdc2ebdf52e63ee3aae8731db# Parent  3d7cd43d591a3f9dd00aa9af889c1e9def6e5026
branching: merge stable in default

diff -r 8c131b97e197 -r 678a9223aad3 hgext3rd/evolve/cmdrewrite.py
--- a/hgext3rd/evolve/cmdrewrite.py	Sun Mar 29 16:00:57 2020 +0700
+++ b/hgext3rd/evolve/cmdrewrite.py	Fri Apr 03 19:10:29 2020 +0200
@@ -1403,7 +1403,7 @@
     for r in revs:
         ctx = repo[r]
         extra = ctx.extra().copy()
-        extra[b'__touch-noise__'] = random.randint(0, 0xffffffff)
+        extra[b'__touch-noise__'] = b'%d' % random.randint(0, 0xffffffff)
         # search for touched parent
         p1 = ctx.p1().node()
         p2 = ctx.p2().node()
diff -r 8c131b97e197 -r 678a9223aad3 hgext3rd/evolve/rewind.py
--- a/hgext3rd/evolve/rewind.py	Sun Mar 29 16:00:57 2020 +0700
+++ b/hgext3rd/evolve/rewind.py	Fri Apr 03 19:10:29 2020 +0200
@@ -198,7 +198,7 @@
     if date is None:
         date = dateutil.makedate()
     noise = b"%s\0%s\0%d\0%d" % (ctx.node(), user, date[0], date[1])
-    extra[b'__rewind-hash__'] = hashlib.sha256(noise).hexdigest()
+    extra[b'__rewind-hash__'] = hashlib.sha256(noise).hexdigest().encode('ascii')
 
     p1 = ctx.p1().node()
     p1 = rewindmap.get(p1, p1)
diff -r 8c131b97e197 -r 678a9223aad3 tests/test-evolve-obshistory-amend-then-fold.t
--- a/tests/test-evolve-obshistory-amend-then-fold.t	Sun Mar 29 16:00:57 2020 +0700
+++ b/tests/test-evolve-obshistory-amend-then-fold.t	Fri Apr 03 19:10:29 2020 +0200
@@ -77,8 +77,8 @@
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
- Actual test
- -----------
+Actual test
+-----------
 
 Check that debugobshistory on head show a coherent graph
   $ hg obslog eb5a0daa2192 --patch
diff -r 8c131b97e197 -r 678a9223aad3 tests/test-evolve-obshistory.t
--- a/tests/test-evolve-obshistory.t	Sun Mar 29 16:00:57 2020 +0700
+++ b/tests/test-evolve-obshistory.t	Fri Apr 03 19:10:29 2020 +0200
@@ -90,8 +90,8 @@
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
- Actual test
- -----------
+Actual test
+-----------
 
   $ hg obslog 7a230b46bf61 --patch
   @  7a230b46bf61 (3) A2