Mercurial > evolve
diff CHANGELOG @ 4710:0e0731406efd
rewriteutil: allow rewriting merge commits (issue4561)
This patch simply allows rewriteutil.rewrite() to work with commits with
multiple parents (i.e. merges). That function is used in such commands as fold,
metaedit, touch, rewind.
The issue 4561 is marked as easy, the limitation is called unnecessary, no
tests fail after this change. What can go wrong.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Tue, 09 Jul 2019 17:08:34 +0800 |
parents | de194ed973ba |
children | 7839720c7c75 |
line wrap: on
line diff
--- a/CHANGELOG Tue Jul 09 17:02:44 2019 +0800 +++ b/CHANGELOG Tue Jul 09 17:08:34 2019 +0800 @@ -8,6 +8,7 @@ * evolve: minor output message improvements * evolve: improve `hg evolve --all` behavior when "." is obsolete * topic: fix confusion in branch heads checking logic + * touch: now works on merge commit too 9.0.1 - in progress -------------------