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 * prune: update to the successor of wdir also with --pair/--biject (issue6142) |
|
15 |
|
16 * evolve: properly prune changeset with no change in case of conflict (issue5967), |
|
17 * evolve: use the same wording as core in case of unresolved conflict, |
|
18 * evolve: minor output message improvements, |
|
19 * evolve: improve `hg evolve --all` behavior when "." is obsolete, |
|
20 |
|
21 * touch: detect resulting divergence in more cases (issue6107), |
|
22 * touch: now works on merge commit too, |
|
23 |
|
24 * rewind: fix behavior for merge commit, |
|
25 |
13 * fold: allow fold with merge commit |
26 * fold: allow fold with merge commit |
14 * metaedit: now also operates on merge commit |
27 |
15 |
28 * metaedit: now also operates on merge commit. |
16 9.0.1 - in progress |
29 |
17 ------------------- |
30 (topic 0.16.0) |
18 |
31 |
19 * pick: no longer forget file in case of conflict (issue6037) |
32 * topic: fix confusion in branch heads checking logic. |
20 * pick: properly report and cleanup "unfinished state" |
33 |
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 |
34 |
26 9.0.0 -- 2019-06-06 |
35 9.0.0 -- 2019-06-06 |
27 ------------------- |
36 ------------------- |
28 |
37 |
29 * evolve: preserve the working directory after resolving instability (BC) |
38 * evolve: preserve the working directory after resolving instability (BC) |