Skip to content
Snippets Groups Projects
Commit c8514f858788 authored by Matt Harbison's avatar Matt Harbison
Browse files

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.)
parent 5e78c100a215
No related branches found
No related tags found
No related merge requests found
......@@ -30,7 +30,7 @@
$ mkdir b && touch b/nonempty
$ hg up
abort: Unlinking directory not permitted: '?\$TESTTMP/t/b'? (re) (windows !)
abort: Unlinking directory not permitted: *$TESTTMP/t/b* (glob) (windows !)
abort: Directory not empty: '?\$TESTTMP/t/b'? (re) (no-windows !)
[255]
$ hg ci
......
......@@ -50,7 +50,7 @@
$ hg st
? name/file
$ hg up 1
abort: Unlinking directory not permitted: '?$TESTTMP/r1/r2/name'? (re) (windows !)
abort: Unlinking directory not permitted: *$TESTTMP/r1/r2/name* (glob) (windows !)
abort: Directory not empty: '?\$TESTTMP/r1/r2/name'? (re) (no-windows !)
[255]
$ cat name/file
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment