Mercurial Mercurial > pub > hg > evolve / 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.
merge with mercurial-3.5 mercurial-3.4
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Tue, 28 Feb 2017 17:19:31 +0100
branchmercurial-3.4
changeset 1821 c0da3186e9a2
parent 1820 056c8052884d (diff)
parent 1800 1554b30b18eb (current diff)
child 2104 e1bc9a1514ec
merge with mercurial-3.5
--- a/.hgtags	Wed Feb 01 16:03:39 2017 +0100
+++ b/.hgtags	Tue Feb 28 17:19:31 2017 +0100
@@ -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
--- a/README	Wed Feb 01 16:03:39 2017 +0100
+++ b/README	Tue Feb 28 17:19:31 2017 +0100
@@ -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.
--- a/debian/changelog	Wed Feb 01 16:03:39 2017 +0100
+++ b/debian/changelog	Tue Feb 28 17:19:31 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
 
--- a/hgext/evolve.py	Wed Feb 01 16:03:39 2017 +0100
+++ b/hgext/evolve.py	Tue Feb 28 17:19:31 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)
evolve