# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1488298311 -3600
# Node ID f23df9d65565beb078b0958ef5075f4e9f843ec2
# Parent  5c86af0da91dcac40ec886a6a4f181f91fec6a2a# Parent  4de90774eade98d2d00fc70a4cb017cb98fd1606
merge with mercurial-3.8

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -43,3 +43,6 @@
 2ad40d972a740a613c4c559104166a015b37cac2 5.4.1
 727c7211c810d304ebf92b32db7ecf697ce46ac6 5.5.0
 99ede2d775458a236a46ad25a93aca473b676eee 5.6.0
+99ede2d775458a236a46ad25a93aca473b676eee 5.6.0
+e7b6e9c4a5d4317f56c2862910c569723b6ea71b 5.6.0
+70694b2621ba9d919bc38303f8901e84caf5da0f 5.6.1
diff --git a/README b/README
--- a/README
+++ b/README
@@ -56,7 +56,11 @@
 Changelog
 =========
 
-5.6.0 -- 2016-10-30
+5.6.1 -- 2017-02-28
+
+ - fix a crash that sometime happened when evolving merges.
+
+5.6.0 -- 2017-02-01
 
  - compatibility with Mercurial 4.1.
  - improvement of prune error message.
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-mercurial-evolve (5.6.0-1) UNRELEASED; urgency=medium
+mercurial-evolve (5.6.1-1) UNRELEASED; urgency=medium
 
   * New Upstream Release
+  * new upstream version
 
- -- Pierre-Yves David <marmoute@nodosa.octopoid.net>  Wed, 01 Feb 2017 15:06:21 +0100
+ -- Pierre-Yves David <marmoute@nodosa.octopoid.net>  Tue, 28 Feb 2017 17:21:34 +0100
 
 mercurial-evolve (5.5.0-1) unstable; urgency=medium
 
diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -4146,7 +4146,19 @@
     """Used by the evolve function to merge dest on top of pctx.
     return the same tuple as merge.graft"""
     if repo['.'].rev() != dest.rev():
-       merge.update(repo, dest, False, True, False)
+        #assert False
+        try:
+            merge.update(repo,
+                         dest,
+                         branchmerge=False,
+                         force=True)
+        except TypeError:
+            # Mercurial  < 43c00ca887d1 (3.7)
+            merge.update(repo,
+                         dest,
+                         branchmerge=False,
+                         force=True,
+                         partial=False)
     if bmactive(repo):
        repo.ui.status(_("(leaving bookmark %s)\n") % bmactive(repo))
     bmdeactivate(repo)