comparison tests/test-touch.t @ 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.

4709:cc3569da7150

  $ hg prune -r .
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
  working directory is now at * (glob)
  1 changesets pruned
  $ hg touch 16 --hidden
  abort: cannot amend merge changesets
  [255]

4710:0e0731406efd

  $ hg prune -r .
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
  working directory is now at * (glob)
  1 changesets pruned
  $ hg touch 16 --hidden
  $ hg glog -r '12+15+17'
  o    17: merge
  |\
  | o  15: ab
  |
  @  12: move
  |
  ~