Skip to content
Snippets Groups Projects
Commit 2c5d79c6 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

packaging: prepare version

parent 35b2d201
No related branches found
No related tags found
No related merge requests found
......@@ -4,8 +4,7 @@
8.1.0 - in progress
-------------------
* compatibility with mercurial 4.7rc0
* evolve: handle branch changes when solving content divergence,
* evolve: improve multiple aspect of divergence resolution
* compatibility with mercurial 4.7
* evolve: improve multiple aspect of content-divergence resolution
* branch changes handling,
* parent changes handling,
......@@ -10,3 +9,4 @@
* branch changes handling,
* parent changes handling,
* description changes handling,
* divergent stack handling,
......@@ -12,4 +12,9 @@
* divergent stack handling,
* evolve: merge commit messages when resolving content divergence (issue5877)
* improved resume, stop and abort of divergent resolution
* evolve: improved automatic resolution of phase-divergence
* evolve: add a --update and --no-update flag to evolve to control final
working copy parent
* evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
* evolve: show unfinished state information in `hg status -v` (issue5886)
* evolve: move bookmarks also when updating to successors (issue5923)
......@@ -14,3 +19,4 @@
* evolve: show unfinished state information in `hg status -v` (issue5886)
* evolve: move bookmarks also when updating to successors (issue5923)
* evolve: improve orphan resolution when combined with divergence (issue5946)
* amend: abort `--patch` by saving an empty file (issue5925)
......@@ -16,5 +22,6 @@
* amend: abort `--patch` by saving an empty file (issue5925)
*
* evolve: add a new `--no-update` flag to keep working copy on the initial
revision.
* evolve: new help section dedicated to resuming operation interrupted by
merge conflit, `hg help evolve.interrupted`.
......@@ -17,7 +24,15 @@
* evolve: add a new `--no-update` flag to keep working copy on the initial
revision.
* evolve: new help section dedicated to resuming operation interrupted by
merge conflit, `hg help evolve.interrupted`.
* obslog: --filternonlocal
* rewind: first limited version of `rewind` command to restore stack of commit to a
precusors state (check command help for detail and limitation)
topic (0.10.0)
* display a hint when a topic becomes empty
8.0.1 -- 2018-06-11
-------------------
......
......@@ -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__ = '8.1.0.dev'
testedwith = '4.3.2 4.4.2 4.5.2 4.6.1'
__version__ = '8.1.0'
testedwith = '4.3.2 4.4.2 4.5.2 4.6.2 4.7'
minimumhgversion = '4.3'
buglink = 'https://bz.mercurial-scm.org/'
......@@ -181,5 +181,5 @@
'topic.active': 'green',
}
__version__ = '0.10.0.dev'
__version__ = '0.10.0'
......@@ -185,5 +185,5 @@
testedwith = '4.3.3 4.4.2 4.5.2 4.6.1'
testedwith = '4.3.3 4.4.2 4.5.2 4.6.2 4.7'
minimumhgversion = '4.3'
buglink = 'https://bz.mercurial-scm.org/'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment