tests/test-merge1.t

39477:8eb2145ff0fb

Test interrupted updates by having a non-empty dir with the same name as one
of the files in a commit we're updating to

  $ mkdir b && touch b/nonempty
  $ hg up
  abort: Directory not empty: '$TESTTMP/t/b'
  [255]
  $ hg ci
  abort: last update was interrupted
  (use 'hg update' to get a consistent checkout)
  [255]

39478:c4a7ba10cdd7

Test interrupted updates by having a non-empty dir with the same name as one
of the files in a commit we're updating to

  $ mkdir b && touch b/nonempty
  $ hg up
  abort: Unlinking directory not permitted: '$TESTTMP/t/b' (windows !)
  abort: Directory not empty: '$TESTTMP/t/b' (no-windows !)
  [255]
  $ hg ci
  abort: last update was interrupted
  (use 'hg update' to get a consistent checkout)
  [255]