comparison tests/test-merge1.t @ 39609:c8514f858788

tests: stabilize change for handling not quoting non-empty-directory

The change originated in cb1329738d64.  I suspect the problem is with the
combination of (re) and the '\' to '/' retry on Windows.  I've no idea if py3 on
Windows needs the quoting, since it can't even run `hg` with no arguments.
(It's dying somewhere on the ctype declarations when win32.py is imported.)

39608:5e78c100a215

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'? (re) (windows !)
  abort: Directory not empty: '?\$TESTTMP/t/b'? (re) (no-windows !)
  [255]
  $ hg ci
  abort: last update was interrupted
  (use 'hg update' to get a consistent checkout)

39609:c8514f858788

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* (glob) (windows !)
  abort: Directory not empty: '?\$TESTTMP/t/b'? (re) (no-windows !)
  [255]
  $ hg ci
  abort: last update was interrupted
  (use 'hg update' to get a consistent checkout)