Mercurial > evolve

comparison CHANGELOG @ 4786:83d0bed86ced stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
packaging: groom changelog prior to release
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 29 Jul 2019 16:41:19 +0200
parents 12a88b988875
children d493d0b6066e
comparison
equal deleted inserted replaced
4775:cc96716f2ebf 4786:83d0bed86ced
1 Changelog 1 Changelog
2 ========= 2 =========
3 3
4 9.1.0 - in progress 4 9.1.0 -- 2019-07-29
5 ------------------- 5 -------------------
6 6
7 * evolve: use the same wording as core in case of unresolved conflict 7 * compatibility with upcoming Mercurial 5.1,
8 * evolve: minor output message improvements 8
9 * evolve: improve `hg evolve --all` behavior when "." is obsolete 9 * pick: no longer forget file in case of conflict (issue6037),
10 * topic: fix confusion in branch heads checking logic 10 * pick: properly report and cleanup "unfinished state",
11 * touch: now works on merge commit too 11
12 * rewind: fix behavior for merge commit 12 * prune: don't update wcp if pruned revision are unrelated (issue6137),
13 * prune: spell --successor flag without any unnecessary shortcuts,
14
15 * evolve: properly prune changeset with no change in case of conflict (issue5967),
16 * evolve: use the same wording as core in case of unresolved conflict,
17 * evolve: minor output message improvements,
18 * evolve: improve `hg evolve --all` behavior when "." is obsolete,
19
20 * touch: detect resulting divergence in more cases (issue6107),
21 * touch: now works on merge commit too,
22
23 * rewind: fix behavior for merge commit,
24
13 * fold: allow fold with merge commit 25 * fold: allow fold with merge commit
14 * metaedit: now also operates on merge commit 26
15 27 * metaedit: now also operates on merge commit.
16 9.0.1 - in progress 28
17 ------------------- 29 (topic 0.16.0)
18 30
19 * pick: no longer forget file in case of conflict (issue6037) 31 * topic: fix confusion in branch heads checking logic.
20 * pick: properly report and cleanup "unfinished state" 32
21 * prune: don't update wcp if pruned revision are unrelated (issue6137)
22 * prune: spell --successor flag without any unnecessary shortcuts
23 * evolve: properly prune changeset with no change in case of conflict (issue5967)
24 * touch: detect resulting divergence in more cases (issue6107)
25 33
26 9.0.0 -- 2019-06-06 34 9.0.0 -- 2019-06-06
27 ------------------- 35 -------------------
28 36
29 * evolve: preserve the working directory after resolving instability (BC) 37 * evolve: preserve the working directory after resolving instability (BC)