# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1488299264 -3600
# Node ID 8cf82e55f48c66abf94f4be08834e9971b3c291c
# Parent  b1a81ef01faaa6ccd59ef7d4afa751b49e20d0bf# Parent  efda653c96a78107a52a0a5b988cbbf405a1cd20
merge with stable

diff -r b1a81ef01faa -r 8cf82e55f48c .hgtags
--- a/.hgtags	Tue Nov 01 16:19:33 2016 +0100
+++ b/.hgtags	Tue Feb 28 17:27:44 2017 +0100
@@ -45,3 +45,4 @@
 99ede2d775458a236a46ad25a93aca473b676eee 5.6.0
 99ede2d775458a236a46ad25a93aca473b676eee 5.6.0
 e7b6e9c4a5d4317f56c2862910c569723b6ea71b 5.6.0
+70694b2621ba9d919bc38303f8901e84caf5da0f 5.6.1
diff -r b1a81ef01faa -r 8cf82e55f48c README
--- a/README	Tue Nov 01 16:19:33 2016 +0100
+++ b/README	Tue Feb 28 17:27:44 2017 +0100
@@ -61,6 +61,10 @@
   - removed old (unpackaged) pushexperiment extension.
   - move all extensions in the official 'hgext3rd' namespace package
 
+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.
diff -r b1a81ef01faa -r 8cf82e55f48c debian/changelog
--- a/debian/changelog	Tue Nov 01 16:19:33 2016 +0100
+++ b/debian/changelog	Tue Feb 28 17:27:44 2017 +0100
@@ -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 -r b1a81ef01faa -r 8cf82e55f48c hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py	Tue Nov 01 16:19:33 2016 +0100
+++ b/hgext3rd/evolve/__init__.py	Tue Feb 28 17:27:44 2017 +0100
@@ -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)