Mercurial > evolve

diff CHANGELOG @ 5599:ba8bc1b0acd2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rewind: actually track folds using fold-* metadata in obsmarkers Switching "(%d changesets obsoleted)" to using successorsmap because it's the source of items in relationships (and the latter variable now can have less items than before this patch).
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 11 Oct 2020 20:50:02 +0800
parents b2de5825e5ca
children d77d61c9e5e9
line wrap: on
line diff
--- a/CHANGELOG	Fri Sep 25 21:47:30 2020 -0700
+++ b/CHANGELOG	Sun Oct 11 20:50:02 2020 +0800
@@ -8,6 +8,7 @@
   * metaedit: update bookmark location when applicable
   * evolve: fix various issues with --continue when solving content-divergence
   * rewind: add a --dry-run flag
+  * rewind: properly record rewind of splits as folds
   * evolve: while resolving conflicts, the evolved node will no longer be a
     dirstate parent (won't show up in `hg parents` and not as `@` in `hg log -G`,
     but it will show up as `%` with hg >= 5.4)