Mercurial > evolve
changeset 3294:57aedd4c39a0
branching: merge stable back into default
New version has been released, hooray.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 12 Dec 2017 04:18:17 +0100 |
| parents | 245f30245bf6 (current diff) d7dc6633bba1 (diff) |
| children | 4d7e002a2bb5 |
| files | hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py |
| diffstat | 5 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Dec 12 04:08:22 2017 +0100 +++ b/.hgtags Tue Dec 12 04:18:17 2017 +0100 @@ -61,3 +61,4 @@ ec0bbf26ce7fadd42c637e01d3750dac96ac0b1b 6.8.0 c56c028f3802202241551e5953bea74ab3a6c434 7.0.0 c4940c22d76b9c6b3c2117a3b490f3c4fd796972 7.0.1 +06a3cb59495636df8b567e49a0fd7fd8fd823074 7.1.0
--- a/CHANGELOG Tue Dec 12 04:08:22 2017 +0100 +++ b/CHANGELOG Tue Dec 12 04:18:17 2017 +0100 @@ -1,7 +1,7 @@ Changelog ========= -7.1.0 - in progress +7.1.0 -- 2017-12-12 ------------------- * verbosity: respect --quiet for prev, next and summary @@ -9,6 +9,7 @@ * obslog: shows the obsmarkers notes * obsdiscover: Improved stable range slice for the experimental obshashrange (client and server need to upgrade to this version) + * split: preserve the branch of the source changeset topic (0.6.0) @@ -16,14 +17,6 @@ (see `hg help -e serverminitopic` for details) * add a new config option `experimental.topic-mode.server` using which a server can reject draft changesets without topic - -7.0.2 - in progress -------------------- - - * split: preserve the branch of the source changeset - -Topic (0.5.2) - * fix behavior of `hg stack` in cases of split * makes code more resilient to partiel initialization * avoid over wrapping inside of long living process
--- a/debian/changelog Tue Dec 12 04:08:22 2017 +0100 +++ b/debian/changelog Tue Dec 12 04:18:17 2017 +0100 @@ -1,4 +1,10 @@ -mercurial-evolve (7.0.1) unstable; urgency=medium +mercurial-evolve (7.1.0-1) unstable; urgency=medium + + * new upstream release + + -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Tue, 12 Dec 2017 03:01:27 +0100 + +mercurial-evolve (7.0.1-1) unstable; urgency=medium * new upstream release
--- a/hgext3rd/evolve/metadata.py Tue Dec 12 04:08:22 2017 +0100 +++ b/hgext3rd/evolve/metadata.py Tue Dec 12 04:18:17 2017 +0100 @@ -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__ = '7.1.0.dev' -testedwith = '4.1.3 4.2.3 4.3.2 4.4.1' +__version__ = '7.2.0.dev' +testedwith = '4.1.3 4.2.3 4.3.2 4.4.2' minimumhgversion = '4.1' buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Tue Dec 12 04:08:22 2017 +0100 +++ b/hgext3rd/topic/__init__.py Tue Dec 12 04:18:17 2017 +0100 @@ -174,9 +174,9 @@ 'topic.active': 'green', } -__version__ = '0.6.0.dev' +__version__ = '0.7.0.dev' -testedwith = '4.1.3 4.2.3 4.3.3 4.4.1' +testedwith = '4.1.3 4.2.3 4.3.3 4.4.2' minimumhgversion = '4.1' buglink = 'https://bz.mercurial-scm.org/'