Mercurial > evolve

comparison CHANGELOG @ 4729:076b6813a7ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 17 Jul 2019 18:06:14 +0200
parents 77bf84025dd5 ef8907df73fc
children 12a88b988875
comparison
equal deleted inserted replaced
4725:f162cafc5000 4729:076b6813a7ea
18 18
19 * pick: no longer forget file in case of conflict (issue6037) 19 * pick: no longer forget file in case of conflict (issue6037)
20 * pick: properly report and cleanup "unfinished state" 20 * pick: properly report and cleanup "unfinished state"
21 * prune: don't update wcp if pruned revision are unrelated (issue6137) 21 * prune: don't update wcp if pruned revision are unrelated (issue6137)
22 * evolve: properly prune changeset with no change in case of conflict (issue5967) 22 * evolve: properly prune changeset with no change in case of conflict (issue5967)
23 * touch: detect resulting divergence in more cases (issue6107)
23 24
24 9.0.0 -- 2019-06-06 25 9.0.0 -- 2019-06-06
25 ------------------- 26 -------------------
26 27
27 * evolve: preserve the working directory after resolving instability (BC) 28 * evolve: preserve the working directory after resolving instability (BC)