Skip to content
Snippets Groups Projects
Commit cb1329738d64 authored by Augie Fackler's avatar Augie Fackler
Browse files

tests: handle Python 3 not quoting non-empty-directory error

I assume this happens on Windows too, so I did the same regex on both
versions of the output. The whole message printed by these aborts
comes from Python, so if we want to exert control over the quoting
here it'll be a bit of a pain.

Differential Revision: https://phab.mercurial-scm.org/D4546
parent fa4d16daf1be
No related branches found
No related tags found
No related merge requests found
......@@ -30,8 +30,8 @@
$ 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 !)
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
......
......@@ -50,8 +50,8 @@
$ hg st
? name/file
$ hg up 1
abort: Unlinking directory not permitted: '$TESTTMP/r1/r2/name' (windows !)
abort: Directory not empty: '$TESTTMP/r1/r2/name' (no-windows !)
abort: Unlinking directory not permitted: '?$TESTTMP/r1/r2/name'? (re) (windows !)
abort: Directory not empty: '?\$TESTTMP/r1/r2/name'? (re) (no-windows !)
[255]
$ cat name/file
text
......
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