changeset 4791:395ab63d2af7

branching: merge stable back into default

The version has been released.

--- a/.hgtags	Mon Jul 29 13:54:57 2019 +0200
+++ b/.hgtags	Tue Jul 30 02:55:22 2019 +0200
@@ -80,3 +80,4 @@
 33c617626fd90a0a00e831b4762f64fecb609317 8.5.0
 05c9dcf5512ed77490a35b4d6b1c3fe860259f48 8.5.1
 756db65030c64b22836fe236d1db3b95477e3ef7 9.0.0
+6f37fdad7ac123ca0a76872ac4639bd1f3c248f7 9.1.0

--- a/CHANGELOG	Mon Jul 29 13:54:57 2019 +0200
+++ b/CHANGELOG	Tue Jul 30 02:55:22 2019 +0200
@@ -1,27 +1,36 @@
 Changelog
 =========
 
-9.1.0 - in progress
+9.1.0 -- 2019-07-29
 -------------------
 
-  * evolve: use the same wording as core in case of unresolved conflict
-  * evolve: minor output message improvements
-  * evolve: improve `hg evolve --all` behavior when "." is obsolete
-  * topic: fix confusion in branch heads checking logic
-  * touch: now works on merge commit too
-  * rewind: fix behavior for merge commit
-  * fold: allow fold with merge commit
-  * metaedit: now also operates on merge commit
+  * compatibility with upcoming Mercurial 5.1,
+
+  * pick: no longer forget file in case of conflict (issue6037),
+  * pick: properly report and cleanup "unfinished state",
+
+  * prune: don't update wcp if pruned revision are unrelated (issue6137),
+  * prune: spell --successor flag without any unnecessary shortcuts,
+  * prune: update to the successor of wdir also with --pair/--biject (issue6142)
+
+  * evolve: properly prune changeset with no change in case of conflict (issue5967),
+  * evolve: use the same wording as core in case of unresolved conflict,
+  * evolve: minor output message improvements,
+  * evolve: improve `hg evolve --all` behavior when "." is obsolete,
 
-9.0.1 - in progress
--------------------
+  * touch: detect resulting divergence in more cases (issue6107),
+  * touch: now works on merge commit too,
+
+  * rewind: fix behavior for merge commit,
+
+  * fold: allow fold with merge commit
 
-  * pick: no longer forget file in case of conflict (issue6037)
-  * pick: properly report and cleanup "unfinished state"
-  * prune: don't update wcp if pruned revision are unrelated (issue6137)
-  * prune: spell --successor flag without any unnecessary shortcuts
-  * evolve: properly prune changeset with no change in case of conflict (issue5967)
-  * touch: detect resulting divergence in more cases (issue6107)
+  * metaedit: now also operates on merge commit.
+
+(topic 0.16.0)
+
+  * topic: fix confusion in branch heads checking logic.
+
 
 9.0.0 -- 2019-06-06
 -------------------

--- a/debian/changelog	Mon Jul 29 13:54:57 2019 +0200
+++ b/debian/changelog	Tue Jul 30 02:55:22 2019 +0200
@@ -1,3 +1,9 @@
+mercurial-evolve (9.1.0-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Pierre-Yves David <[e-mail]>  Mon, 29 Jul 2019 16:46:26 +0200
+
 mercurial-evolve (9.0.0-1) unstable; urgency=medium
 
   * new upstream release

--- a/hgext3rd/evolve/metadata.py	Mon Jul 29 13:54:57 2019 +0200
+++ b/hgext3rd/evolve/metadata.py	Tue Jul 30 02:55:22 2019 +0200
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-__version__ = b'9.1.0.dev'
-testedwith = b'4.5.2 4.6.2 4.7 4.8 4.9 5.0'
+__version__ = b'9.2.0.dev'
+testedwith = b'4.5.2 4.6.2 4.7 4.8 4.9 5.0 5.1'
 minimumhgversion = b'4.5'
 buglink = b'https://bz.mercurial-scm.org/'

--- a/hgext3rd/topic/__init__.py	Mon Jul 29 13:54:57 2019 +0200
+++ b/hgext3rd/topic/__init__.py	Tue Jul 30 02:55:22 2019 +0200
@@ -187,9 +187,9 @@
               'topic.active': 'green',
              }
 
-__version__ = b'0.16.0.dev'
+__version__ = b'0.17.0.dev'
 
-testedwith = b'4.5.2 4.6.2 4.7 4.8 4.9 5.0'
+testedwith = b'4.5.2 4.6.2 4.7 4.8 4.9 5.0 5.1'
 minimumhgversion = b'4.5'
 buglink = b'https://bz.mercurial-scm.org/'