comparison tests/test-update-branches.t @ 48406:51f521900473

update: add a test for `--merge` overriding the "abort" config

I don't see this behavior tested anywhere.

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

48405:acdd4a42deaa

  M foo

  $ revtest '--merge none dirty linear' dirty 1 2 --check
  abort: uncommitted changes
  parent=1
  M foo

  $ revtest 'none dirty linear' dirty 1 2 --clean
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  parent=2

48406:51f521900473

  M foo

  $ revtest '--merge none dirty linear' dirty 1 2 --check
  abort: uncommitted changes
  parent=1
  M foo

  $ revtest '--merge none dirty linear' dirty 1 2 --merge
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  parent=2
  M foo

  $ revtest 'none dirty linear' dirty 1 2 --clean
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  parent=2