diff --git a/.hgtags b/.hgtags index f0c18ad24273448b7ebb8bcc84c5478c1e92f854_LmhndGFncw==..48abf37e552bf2bf142f57b2a356472ea11e44d2_LmhndGFncw== 100644 --- a/.hgtags +++ b/.hgtags @@ -83,3 +83,4 @@ 6f37fdad7ac123ca0a76872ac4639bd1f3c248f7 9.1.0 40795751be1c329ec23202ecd79ba45623e1df66 9.2.0 d989bab720e5f7638a9e58fda76cf3f4b40d0611 9.2.1 +ef41094c34e162eb32ef24bf66d9776d1112751a 9.2.2 diff --git a/CHANGELOG b/CHANGELOG index f0c18ad24273448b7ebb8bcc84c5478c1e92f854_Q0hBTkdFTE9H..48abf37e552bf2bf142f57b2a356472ea11e44d2_Q0hBTkdFTE9H 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,6 @@ Changelog ========= -9.2.2 - in progress +9.2.2 -- 2020-01-31 ------------------- @@ -5,9 +5,5 @@ ------------------- - * pick: don't create any successors when there were no changes (issue6093), - * metaedit: don't change commit date by default (issue5994), - * rewind: preserve date - * py3: fix setup.py --version - * py3: fix documentation generation - * py3: fix some exception formatting + * amend: cleany abort when both `--patch` and `--extract` are passed + * compatibility for changes in upcoming Mercurial 5.3 * debian: allow to build with python 3 @@ -13,4 +9,2 @@ * debian: allow to build with python 3 - * topic: add more options to command synopsis string - * evolve: use more often seen metavariables in command synopsis strings * documentation: update text and add missing figures @@ -16,3 +10,2 @@ * documentation: update text and add missing figures - * amend: cleany abort when both `--patch` and `--extract` are passed * evolve: also merge the date field when solving content-divergence @@ -18,5 +11,4 @@ * evolve: also merge the date field when solving content-divergence - * compatibility for changes in upcoming Mercurial 5.3 * evolve: fix content-divergence resolution when p1 is null (issue6201) * evolve: make sure divergence resolution doesn't undo changes (issue6203) * evolve: preserve date when resolving content-divergence (issue6202) @@ -20,6 +12,14 @@ * evolve: fix content-divergence resolution when p1 is null (issue6201) * evolve: make sure divergence resolution doesn't undo changes (issue6203) * evolve: preserve date when resolving content-divergence (issue6202) + * evolve: use more often seen metavariables in command synopsis strings + * metaedit: don't change commit date by default (issue5994), + * pick: don't create any successors when there were no changes (issue6093), + * py3: fix documentation generation + * py3: fix setup.py --version + * py3: fix some exception formatting + * rewind: preserve date + * topic: add more options to command synopsis string * topic: fix a bug in logic of choosing destination for hg update * topic: fix a bug in logic to choose destination when no active topic diff --git a/debian/changelog b/debian/changelog index f0c18ad24273448b7ebb8bcc84c5478c1e92f854_ZGViaWFuL2NoYW5nZWxvZw==..48abf37e552bf2bf142f57b2a356472ea11e44d2_ZGViaWFuL2NoYW5nZWxvZw== 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,10 @@ -mercurial-evolve (9.2.1-1.1) UNRELEASED; urgency=medium +mercurial-evolve (9.2.2-1) unstable; urgency=medium + + * new upstream release + + -- Anton Shestakov <av6@dwimlabs.net> Fri, 31 Jan 2020 14:10:11 +0700 + +mercurial-evolve (9.2.1-1.1) unstable; urgency=medium * build with pybuild and sphinxdoc * update debhelper compat to 10 diff --git a/hgext3rd/evolve/metadata.py b/hgext3rd/evolve/metadata.py index f0c18ad24273448b7ebb8bcc84c5478c1e92f854_aGdleHQzcmQvZXZvbHZlL21ldGFkYXRhLnB5..48abf37e552bf2bf142f57b2a356472ea11e44d2_aGdleHQzcmQvZXZvbHZlL21ldGFkYXRhLnB5 100644 --- a/hgext3rd/evolve/metadata.py +++ b/hgext3rd/evolve/metadata.py @@ -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.2.2.dev' -testedwith = b'4.5.2 4.6.2 4.7 4.8 4.9 5.0 5.1' +__version__ = b'9.2.3.dev' +testedwith = b'4.5.2 4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3' minimumhgversion = b'4.5' buglink = b'https://bz.mercurial-scm.org/' diff --git a/hgext3rd/topic/__init__.py b/hgext3rd/topic/__init__.py index f0c18ad24273448b7ebb8bcc84c5478c1e92f854_aGdleHQzcmQvdG9waWMvX19pbml0X18ucHk=..48abf37e552bf2bf142f57b2a356472ea11e44d2_aGdleHQzcmQvdG9waWMvX19pbml0X18ucHk= 100644 --- a/hgext3rd/topic/__init__.py +++ b/hgext3rd/topic/__init__.py @@ -187,5 +187,5 @@ b'topic.active': b'green', } -__version__ = b'0.17.2.dev' +__version__ = b'0.17.3.dev' @@ -191,5 +191,5 @@ -testedwith = b'4.5.2 4.6.2 4.7 4.8 4.9 5.0 5.1' +testedwith = b'4.5.2 4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3' minimumhgversion = b'4.5' buglink = b'https://bz.mercurial-scm.org/'