Mercurial > evolve

diff CHANGELOG @ 4723:41885988921e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fold: allow operations on merge commits with some conditions It's possible to fold revision chains that include a single merge commit: just fold everything into the merge commit while saving its other parent (so it continues being a merge commit). It's also possible to fold revisions that include multiple merge commits, on the condition that they merge with not more than 2 external changesets (i.e. a changesets that aren't going to be folded).
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Jul 2019 18:07:03 +0800
parents 7839720c7c75
children 77bf84025dd5
line wrap: on
line diff
--- a/CHANGELOG	Thu Jul 11 17:04:08 2019 +0800
+++ b/CHANGELOG	Thu Jul 11 18:07:03 2019 +0800
@@ -10,6 +10,7 @@
   * topic: fix confusion in branch heads checking logic
   * touch: now works on merge commit too
   * rewind: fix behavior for merge commit
+  * fold: allow fold with merge commit
 
 9.0.1 - in progress
 -------------------