Mercurial > evolve

comparison CHANGELOG @ 3851:9ebed1e95ef7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changelog: add a changelog entry about divergence resolution We made a lots of progress there.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 14 Jun 2018 02:58:30 +0200
parents 231f593ccd5f
children b1eb2dea6737
comparison
equal deleted inserted replaced
3850:340cf6fbe9e9 3851:9ebed1e95ef7
3 3
4 8.1.0 - in progress 4 8.1.0 - in progress
5 ------------------- 5 -------------------
6 6
7 * evolve: handle branch changes when solving content divergence, 7 * evolve: handle branch changes when solving content divergence,
8 * evolve: improve multiple aspect of divergence resolution
9 * branch changes handling,
10 * parent changes handling,
11 * divergent stack handling,
8 * evolve: add a help section dedicated to interrupted evolve, 12 * evolve: add a help section dedicated to interrupted evolve,
9 * evolve: merge commit messages when resolving content divergence (issue5877) 13 * evolve: merge commit messages when resolving content divergence (issue5877)
10 * evolve: show unfinished state information in `hg status -v` (issue5886) 14 * evolve: show unfinished state information in `hg status -v` (issue5886)
11 * evolve: add a new `--no-update` flag to keep working copy on the initial 15 * evolve: add a new `--no-update` flag to keep working copy on the initial
12 revision. 16 revision.
13 17
14 8.0.1 -- 2018-06-11 18 8.0.1 -- 2018-06-11
15 ------------------- 19 -------------------
16 20
17 * compatibility with mercurial 4.6.1 21 * compatibility with mercurial 4.6.1