tests/test-merge4.t

repoview: add more tests to track operation not supposed to trigger filtering

This test is useful to confirm we removed filtering trigger and to prevent
it to come back without us noticing.

The commands tested in the test were initially introduced one by one. However,
on Martin von Zweigbergk request, we are adding them all at once.

Differential Revision: https://phab.mercurial-scm.org/D7514

  $ hg init
  $ echo This is file a1 > a
  $ hg add a
  $ hg commit -m "commit #0"
  $ echo This is file b1 > b
  $ hg add b
  $ hg commit -m "commit #1"
  $ hg update 0
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ echo This is file c1 > c
  $ hg add c
  $ hg commit -m "commit #2"
  created new head
  $ hg merge 1
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ rm b
  $ echo This is file c22 > c

Test hg behaves when committing with a missing file added by a merge

  $ hg commit -m "commit #3"
  abort: cannot commit merge with missing files
  [255]