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.

     1

. $TESTDIR/testlib/common.sh

     2

     3

cat >> $HGRCPATH <<EOF

     4

[ui]

     5

interactive = true

     6

[phases]

     7

publish=False

     8

[extensions]

     9

evolve =

    10

[experimental]

    11

evolution.effect-flags = yes

    12

EOF

    13

    14

sync() {

    15

   hg pull -R $TESTTMP/server . -q

    16

}