comparison tests/test-prev-next.t @ 3812:25dfa95c37fd stable

next-prev: add tests showing --merge not respected in some cases

This patch adds tests which show that --merge is not respected when you set
commands.update.check to any value.

This is a bug I wrote few days ago and will fix it in next changeset.
I like this process of writing bugs and fixing them.

3793:3343c5491b31

  $ hg next
  abort: conflicting changes
  (do you want --merge?)
  [255]

3812:25dfa95c37fd

  $ hg next
  abort: conflicting changes
  (do you want --merge?)
  [255]

Test that --merge still works fine with commands.update.check set

XXX: yes we want --merge and we passed that!
  $ echo hi > bar
  $ echo bar >> bar
  $ hg next --merge
  abort: conflicting changes
  (do you want --merge?)
  [255]

Testing --merge works with other values of commands.update.check also

XXX: things are broken!
  $ hg prev --merge --config commands.update.check=abort
  abort: uncommitted changes
  (do you want --merge?)
  [255]

  $ hg revert --all
  forgetting bar
  reverting wat

  $ echo bar > bar
  $ hg add bar

  $ hg next --merge --config commands.update.check=abort
  abort: uncommitted changes
  (do you want --merge?)
  [255]