Mercurial > evolve

diff CHANGELOG @ 4722:7839720c7c75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rewind: make sure merge commits include files from p1 and p2 Otherwise rewinding a merge commit makes it lose all changes. This fix populates `updates` argument of rewriteutil.rewrite() with parent changesets. That argument is normally used for folding multiple changesets, but in this case it's simply used to include files from p1 and p2. Usually, rewrite() works fine using ctx.files(), but that function can return an empty list when ctx is a merge commit.
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Jul 2019 17:04:08 +0800
parents 0e0731406efd
children 41885988921e
line wrap: on
line diff
--- a/CHANGELOG	Wed Jul 10 18:16:38 2019 +0800
+++ b/CHANGELOG	Thu Jul 11 17:04:08 2019 +0800
@@ -9,6 +9,7 @@
   * evolve: improve `hg evolve --all` behavior when "." is obsolete
   * topic: fix confusion in branch heads checking logic
   * touch: now works on merge commit too
+  * rewind: fix behavior for merge commit
 
 9.0.1 - in progress
 -------------------