Mercurial > evolve

diff tests/test-touch.t @ 4710:0e0731406efd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 cc3569da7150
children b69497b23d31
line wrap: on
line diff
--- a/tests/test-touch.t	Tue Jul 09 17:02:44 2019 +0800
+++ b/tests/test-touch.t	Tue Jul 09 17:08:34 2019 +0800
@@ -186,5 +186,11 @@
   working directory is now at * (glob)
   1 changesets pruned
   $ hg touch 16 --hidden
-  abort: cannot amend merge changesets
-  [255]
+  $ hg glog -r '12+15+17'
+  o    17: merge
+  |\
+  | o  15: ab
+  |
+  @  12: move
+  |
+  ~